zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rebase tidies

This commit is contained in:
Deirdre Connolly 2021-04-30 00:09:50 -04:00
parent d0180423c1
commit 566a10151c
4 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Cargo.lock generated
View File

@ -77,7 +77,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
dependencies = [ dependencies = [
"cipher", "cipher",
"opaque-debug 0.3.0", "opaque-debug",
] ]
[[package]] [[package]]
@ -87,7 +87,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
dependencies = [ dependencies = [
"cipher", "cipher",
"opaque-debug 0.3.0", "opaque-debug",
] ]
[[package]] [[package]]
@ -408,25 +408,13 @@ dependencies = [
"constant_time_eq", "constant_time_eq",
] ]
[[package]]
name = "block-buffer"
<ersion = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
dependencies = [
"block-padding 0.1.5",
"byte-tools",
"byteorder",
"generic-array 0.12.3",
]
[[package]] [[package]]
name = "block-buffer" name = "block-buffer"
version = "0.9.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [ dependencies = [
"generic-array 0.14.4", "generic-array",
] ]
[[package]] [[package]]
@ -435,19 +423,10 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0"
dependencies = [ dependencies = [
"block-padding 0.2.1", "block-padding",
"cipher", "cipher",
] ]
[[package]]
name = "block-padding"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
dependencies = [
"byte-tools",
]
[[package]] [[package]]
name = "block-padding" name = "block-padding"
version = "0.2.1" version = "0.2.1"
@ -595,7 +574,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
dependencies = [ dependencies = [
"generic-array 0.14.4", "generic-array",
] ]
[[package]] [[package]]
@ -2784,7 +2763,7 @@ checksum = "5dcf30702f15c157e348b4ccef28b1224fc7da8f8430d553bdc47b2d6599107b"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
"byteorder", "byteorder",
"digest 0.9.0", "digest",
"funty", "funty",
"jubjub", "jubjub",
"rand_core 0.6.2", "rand_core 0.6.2",

2
zebra-chain/Cargo.toml
View File

@ -53,10 +53,10 @@ ed25519-zebra = "2"
equihash = "0.1" equihash = "0.1"
redjubjub = "0.4" redjubjub = "0.4"
zebra-test = { path = "../zebra-test/", optional = true }
[dev-dependencies] [dev-dependencies]
bincode = "1" bincode = "1"
color-eyre = "0.5.11" color-eyre = "0.5.11"
criterion = { version = "0.3", features = ["html_reports"] } criterion = { version = "0.3", features = ["html_reports"] }
spandoc = "0.2" spandoc = "0.2"

2
zebra-chain/src/sapling.rs
View File

@ -5,8 +5,6 @@ mod address;
mod arbitrary; mod arbitrary;
mod commitment; mod commitment;
mod note; mod note;
mod output;
mod spend;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;

7
zebra-chain/src/serialization/serde_helpers.rs
View File

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