Rebase tidies

ZcashFoundation · Apr 30, 2021 · 566a101 · 566a101
1 parent d018042
commit 566a101
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
@@ -53,10 +53,10 @@ ed25519-zebra = "2"
 equihash = "0.1"
 redjubjub = "0.4"
 
+zebra-test = { path = "../zebra-test/", optional = true }
 
 [dev-dependencies]
 bincode = "1"
-
 color-eyre = "0.5.11"
 criterion = { version = "0.3", features = ["html_reports"] }
 spandoc = "0.2"

diff --git a/zebra-chain/src/sapling.rs b/zebra-chain/src/sapling.rs
@@ -5,8 +5,6 @@ mod address;
 mod arbitrary;
 mod commitment;
 mod note;
-mod output;
-mod spend;
 #[cfg(test)]
 mod tests;
 

diff --git a/zebra-chain/src/serialization/serde_helpers.rs b/zebra-chain/src/serialization/serde_helpers.rs
@@ -76,10 +76,3 @@ impl From<Base> for pallas::Base {
         pallas::Base::from_bytes(&local.bytes).unwrap()
     }
 }
-
-#[derive(Deserialize, Serialize)]
-#[serde(remote = "futures::future::Either")]
-pub enum Either<A, B> {
-    Left(A),
-    Right(B),
-}