[consensus breaking] New Improved Merkle Proofs (#1119)

* new improved Merkle proofs * fix pool and chain tests * fixup core tests after the merge
2018-06-20 15:18:52 -04:00
parent 70ba1c838c
commit 0ff6763ee6
23 changed files with 632 additions and 541 deletions
@@ -16,7 +16,7 @@ use std::sync::Arc;

 use chain;
 use core::core::hash::Hashed;
-use core::core::pmmr::MerkleProof;
+use core::core::merkle_proof::MerkleProof;
 use core::{core, ser};
 use p2p;
 use serde;