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

fixes after merge with master

This commit is contained in:
debris 2016-12-09 19:06:33 +01:00
parent 9d0afa4592
commit 398d5d5836
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/src/v1/types/block_template.rs
View File

@ -99,7 +99,7 @@ impl From<miner::BlockTemplate> for BlockTemplate {
impl From<db::IndexedTransaction> for BlockTemplateTransaction {
fn from(transaction: db::IndexedTransaction) -> Self {
use ser::serialize;
let serialize = serialize(&transaction.transaction);
let serialize = serialize(&transaction.raw);
BlockTemplateTransaction {
data: RawTransaction::new(Vec::from((*serialize).clone())),
..Default::default()

2
sync/src/orphan_transactions_pool.rs
View File

@ -76,7 +76,7 @@ impl OrphanTransactionsPool {
let child_entry = self.by_hash.get_mut(child).expect("every entry in by_parent.values() has corresponding entry in by_hash.keys()");
child_entry.remove_known_parent(&hash)
};
if all_parents_are_known {
removed_orphans_hashes.push(child.clone());
removed_orphans.push((child.clone(), self.by_hash.remove(child).expect("checked couple of lines above").transaction));