zecfoundation
/
parity-zcash
mirror of https://github.com/ZcashFoundation/parity-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into regtests

This commit is contained in:
NikVolf 2016-12-15 14:17:40 +01:00
parent 769e1c4229 3d1db18f3c
commit 8311b38cf3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sync/src/synchronization_verifier.rs
View File

@ -116,7 +116,6 @@ impl AsyncVerifier {
}
} else {
ChainMemoryPoolTransactionOutputProvider::for_block(chain.clone())
.expect("no error when creating for block")
};
execute_verification_task(&sink, &prevout_provider, &verifier, task)
},
@ -252,14 +251,14 @@ impl ChainMemoryPoolTransactionOutputProvider {
ChainMemoryPoolTransactionOutputProvider::for_double_spend_check_result(chain, check_result)
}
pub fn for_block(chain: ChainRef) -> Result<Self, verification::TransactionError> {
pub fn for_block(chain: ChainRef) -> Self {
// we have to check if there are another in-mempool transactions which spent same outputs here
let check_result = DoubleSpendCheckResult::NoDoubleSpend;
ChainMemoryPoolTransactionOutputProvider::for_double_spend_check_result(chain, check_result)
.expect("check_result is NoDoubleSpend; NoDoubleSpend means no error; qed")
}
fn for_double_spend_check_result(chain: ChainRef, check_result: DoubleSpendCheckResult) -> Result<Self, verification::TransactionError> {
println!("{:?}", check_result);
match check_result {
DoubleSpendCheckResult::DoubleSpend(_, hash, index) => Err(verification::TransactionError::UsingSpentOutput(hash, index)),
DoubleSpendCheckResult::NoDoubleSpend => Ok(ChainMemoryPoolTransactionOutputProvider {