Merge branch 'master' into pv64
This commit is contained in:
commit
6977d335e9
@ -498,13 +498,12 @@ impl BlockChainClient for TestBlockChainClient {
|
|||||||
// import right here
|
// import right here
|
||||||
let tx = transactions.into_iter().filter_map(|bytes| UntrustedRlp::new(&bytes).as_val().ok()).collect();
|
let tx = transactions.into_iter().filter_map(|bytes| UntrustedRlp::new(&bytes).as_val().ok()).collect();
|
||||||
self.import_transactions(tx);
|
self.import_transactions(tx);
|
||||||
|
|
||||||
|
fn take_snapshot(&self, _root_dir: &Path) {
|
||||||
|
unimplemented!()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn pending_transactions(&self) -> Vec<SignedTransaction> {
|
fn pending_transactions(&self) -> Vec<SignedTransaction> {
|
||||||
self.miner.pending_transactions()
|
self.miner.pending_transactions()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn take_snapshot(&self, _root_dir: &Path) {
|
|
||||||
unimplemented!()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user