Core/mwixnet
0
0
Fork 0
mirror of https://github.com/mimblewimble/mwixnet.git synced 2025-02-01 08:51:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

removing redundant code

Browse source
This commit is contained in:
scilio 2022-08-13 13:39:54 -04:00
parent 856817af8b
commit c165fd9341
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/rpc.rs
View file

@ -114,7 +114,6 @@ pub fn listen(
if secs == 0 { if secs == 0 {
let _ = server.lock().unwrap().execute_round(); let _ = server.lock().unwrap().execute_round();
secs = 0;
} }
} }
}); });

12
src/server.rs
View file

@ -1,7 +1,7 @@
use crate::config::ServerConfig; use crate::config::ServerConfig;
use crate::node::{self, GrinNode}; use crate::node::{self, GrinNode};
use crate::onion::Onion; use crate::onion::Onion;
use crate::secp::{self, ComSignature, Commitment, RangeProof, Secp256k1, SecretKey}; use crate::secp::{ComSignature, Commitment, RangeProof, Secp256k1, SecretKey};
use crate::wallet::{self, Wallet}; use crate::wallet::{self, Wallet};
use grin_core::core::{Input, Output, OutputFeatures, TransactionBody}; use grin_core::core::{Input, Output, OutputFeatures, TransactionBody};
@ -137,16 +137,10 @@ impl Server for ServerImpl {
}); });
} }
// Calculate final output commitment
let output_commit = secp::add_excess(&onion.commit, &peeled.0.excess)
.map_err(|e| SwapError::UnknownError(e.to_string()))?;
let output_commit = secp::sub_value(&output_commit, fee)
.map_err(|e| SwapError::UnknownError(e.to_string()))?;
// Verify the bullet proof and build the final output // Verify the bullet proof and build the final output
if let Some(r) = peeled.0.rangeproof { if let Some(r) = peeled.0.rangeproof {
let secp = Secp256k1::with_caps(secp256k1zkp::ContextFlag::Commit); let secp = Secp256k1::with_caps(secp256k1zkp::ContextFlag::Commit);
secp.verify_bullet_proof(output_commit, r, None) secp.verify_bullet_proof(peeled.1.commit, r, None)
.map_err(|_| SwapError::InvalidRangeproof)?; .map_err(|_| SwapError::InvalidRangeproof)?;
} else { } else {
// milestone 3: only the last hop will have a rangeproof // milestone 3: only the last hop will have a rangeproof
@ -164,7 +158,7 @@ impl Server for ServerImpl {
onion.commit, onion.commit,
Submission { Submission {
excess: peeled.0.excess, excess: peeled.0.excess,
output_commit, output_commit: peeled.1.commit,
rangeproof: peeled.0.rangeproof, rangeproof: peeled.0.rangeproof,
input, input,
fee, fee,