Merge pull request #965 from nuttycom/private_tree_ser

zcash_client_sqlite: `serialization` module should not have been public.

zcash_client_backend/Cargo.toml

@@ -103,6 +103,7 @@ test-dependencies = [
     "incrementalmerkletree/test-dependencies"
 ]
 unstable = ["byteorder"]
+unstable-serialization = ["byteorder"]
 
 [lib]
 bench = false

zcash_client_backend/src/lib.rs

@@ -20,6 +20,9 @@ pub mod scanning;
 pub mod wallet;
 pub mod zip321;
 
+#[cfg(feature = "unstable-serialization")]
+pub mod serialization;
+
 pub use decrypt::{decrypt_transaction, DecryptedOutput, TransferType};
 
 #[cfg(test)]

zcash_client_backend/src/serialization.rs

@@ -0,0 +1 @@
+pub mod shardtree;

zcash_client_sqlite/CHANGELOG.md

@@ -11,8 +11,6 @@ and this library adheres to Rust's notion of
 ### Added
 - `zcash_client_sqlite::commitment_tree` Types related to management of note
   commitment trees using the `shardtree` crate.
-- `zcash_client_sqlite::serialization` Serialization formats for data stored
-  as SQLite BLOBs in the wallet database.
 - A new default-enabled feature flag `multicore`. This allows users to disable
   multicore support by setting `default_features = false` on their
   `zcash_primitives`, `zcash_proofs`, and `zcash_client_sqlite` dependencies.

zcash_client_sqlite/Cargo.toml

@@ -62,7 +62,7 @@ tempfile = "3.5.0"
 zcash_note_encryption = "0.4"
 zcash_proofs = { version = "=0.13.0-rc.1", path = "../zcash_proofs" }
 zcash_primitives = { version = "=0.13.0-rc.1", path = "../zcash_primitives", features = ["test-dependencies"] }
-zcash_client_backend = { version = "=0.10.0-rc.1", path = "../zcash_client_backend", features = ["test-dependencies"] }
+zcash_client_backend = { version = "=0.10.0-rc.1", path = "../zcash_client_backend", features = ["test-dependencies", "unstable-serialization"] }
 zcash_address = { version = "0.3", path = "../components/zcash_address", features = ["test-dependencies"] }
 
 [features]

zcash_client_sqlite/src/lib.rs

@@ -85,7 +85,6 @@ use {
 
 pub mod chain;
 pub mod error;
-pub mod serialization;
 
 pub mod wallet;
 use wallet::{

zcash_client_sqlite/src/wallet/commitment_tree.rs

@@ -18,7 +18,7 @@ use shardtree::{
 
 use zcash_primitives::{consensus::BlockHeight, merkle_tree::HashSer};
 
-use crate::serialization::{read_shard, write_shard};
+use zcash_client_backend::serialization::shardtree::{read_shard, write_shard};
 
 /// Errors that can appear in SQLite-back [`ShardStore`] implementation operations.
 #[derive(Debug)]