Merge pull request #884 from zcash/update-shardtree-rev

Migrate to latest `shardtree` revision

Cargo.toml

@@ -19,6 +19,6 @@ panic = 'abort'
 codegen-units = 1
 
 [patch.crates-io]
-incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "2a667f500958d517c6b2ea608477140afd907fd8" }
-shardtree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "2a667f500958d517c6b2ea608477140afd907fd8" }
+incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "da97e6c399c5acddedad2c1730dbb7ee55499a2f" }
+shardtree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "da97e6c399c5acddedad2c1730dbb7ee55499a2f" }
 orchard = { git = "https://github.com/zcash/orchard.git", rev = "6ef89d5f154de2cf7b7dd87edb8d8c49158beebb" }

zcash_client_backend/src/data_api.rs

@@ -7,7 +7,7 @@ use std::num::NonZeroU32;
 
 use incrementalmerkletree::Retention;
 use secrecy::SecretVec;
-use shardtree::{ShardStore, ShardTree, ShardTreeError};
+use shardtree::{error::ShardTreeError, store::ShardStore, ShardTree};
 use zcash_primitives::{
     block::BlockHash,
     consensus::BlockHeight,
@@ -584,7 +584,7 @@ pub trait WalletCommitmentTrees {
 pub mod testing {
     use incrementalmerkletree::Address;
     use secrecy::{ExposeSecret, SecretVec};
-    use shardtree::{memory::MemoryShardStore, ShardTree, ShardTreeError};
+    use shardtree::{error::ShardTreeError, store::memory::MemoryShardStore, ShardTree};
     use std::{collections::HashMap, convert::Infallible};
 
     use zcash_primitives::{

zcash_client_backend/src/data_api/error.rs

@@ -1,8 +1,9 @@
 //! Types for wallet error handling.
 
-use shardtree::ShardTreeError;
 use std::error;
 use std::fmt::{self, Debug, Display};
+
+use shardtree::error::ShardTreeError;
 use zcash_primitives::{
     transaction::{
         builder,

zcash_client_backend/src/data_api/wallet.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 use std::{convert::Infallible, num::NonZeroU32};
 
-use shardtree::{ShardStore, ShardTree, ShardTreeError};
+use shardtree::{error::ShardTreeError, store::ShardStore, ShardTree};
 use zcash_primitives::{
     consensus::{self, BlockHeight, NetworkUpgrade},
     memo::MemoBytes,

zcash_client_sqlite/src/error.rs

@@ -5,7 +5,7 @@ use std::error;
 use std::fmt;
 use std::io;
 
-use shardtree::ShardTreeError;
+use shardtree::error::ShardTreeError;
 use zcash_client_backend::encoding::{Bech32DecodeError, TransparentCodecError};
 use zcash_primitives::{consensus::BlockHeight, zip32::AccountId};
 

zcash_client_sqlite/src/lib.rs

@@ -42,7 +42,7 @@ use secrecy::{ExposeSecret, SecretVec};
 use std::{borrow::Borrow, collections::HashMap, convert::AsRef, fmt, io, ops::Range, path::Path};
 
 use incrementalmerkletree::Position;
-use shardtree::{ShardTree, ShardTreeError};
+use shardtree::{error::ShardTreeError, ShardTree};
 use zcash_primitives::{
     block::BlockHash,
     consensus::{self, BlockHeight},

zcash_client_sqlite/src/wallet/commitment_tree.rs

@@ -10,8 +10,9 @@ use zcash_client_backend::data_api::chain::CommitmentTreeRoot;
 
 use incrementalmerkletree::{Address, Hashable, Level, Position, Retention};
 use shardtree::{
-    Checkpoint, LocatedPrunableTree, LocatedTree, PrunableTree, RetentionFlags, ShardStore,
-    ShardTreeError, TreeState,
+    error::ShardTreeError,
+    store::{Checkpoint, ShardStore, TreeState},
+    LocatedPrunableTree, LocatedTree, PrunableTree, RetentionFlags,
 };
 
 use zcash_primitives::{consensus::BlockHeight, merkle_tree::HashSer};

zcash_client_sqlite/src/wallet/init.rs

@@ -8,7 +8,7 @@ use rusqlite::{self, types::ToSql};
 use schemer::{Migrator, MigratorError};
 use schemer_rusqlite::RusqliteAdapter;
 use secrecy::SecretVec;
-use shardtree::{ShardTree, ShardTreeError};
+use shardtree::{error::ShardTreeError, ShardTree};
 use uuid::Uuid;
 
 use zcash_primitives::{

zcash_client_sqlite/src/wallet/init/migrations/shardtree_support.rs

@@ -8,7 +8,7 @@ use incrementalmerkletree::Retention;
 use rusqlite::{self, named_params, params};
 use schemer;
 use schemer_rusqlite::RusqliteMigration;
-use shardtree::{caching::CachingShardStore, ShardTree, ShardTreeError};
+use shardtree::{error::ShardTreeError, store::caching::CachingShardStore, ShardTree};
 use tracing::{debug, trace};
 use uuid::Uuid;