diff --git a/Cargo.toml b/Cargo.toml index 2139b2cf5..e040aea81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,4 @@ panic = 'abort' codegen-units = 1 [patch.crates-io] -# In development. -incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "b7bd6246122a6e9ace8edb51553fbf5228906cbb" } zcash_encoding = { path = "components/zcash_encoding" } diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index 83adcde85..a9e8c6685 100644 --- a/zcash_primitives/Cargo.toml +++ b/zcash_primitives/Cargo.toml @@ -29,7 +29,7 @@ ff = "0.11" fpe = "0.5" group = "0.11" hex = "0.4" -incrementalmerkletree = "0.1" +incrementalmerkletree = "0.2" jubjub = "0.8" lazy_static = "1" log = "0.4" diff --git a/zcash_primitives/src/merkle_tree/incremental.rs b/zcash_primitives/src/merkle_tree/incremental.rs index 5323e1379..ae3535fef 100644 --- a/zcash_primitives/src/merkle_tree/incremental.rs +++ b/zcash_primitives/src/merkle_tree/incremental.rs @@ -174,30 +174,25 @@ pub fn read_bridge_v1(mut reader: R) -> io::Result< pub const EMPTY_CHECKPOINT: u8 = 0; pub const BRIDGE_CHECKPOINT: u8 = 1; -pub fn write_checkpoint_v1( - mut writer: W, - checkpoint: &Checkpoint, -) -> io::Result<()> { +pub fn write_checkpoint_v1(mut writer: W, checkpoint: &Checkpoint) -> io::Result<()> { match checkpoint { Checkpoint::Empty => { writer.write_u8(EMPTY_CHECKPOINT)?; } - Checkpoint::AtIndex(i, b) => { + Checkpoint::AtIndex(i) => { writer.write_u8(BRIDGE_CHECKPOINT)?; writer.write_u64::(*i as u64)?; - write_bridge_v1(&mut writer, b)?; } } Ok(()) } -pub fn read_checkpoint_v1(mut reader: R) -> io::Result> { +pub fn read_checkpoint_v1(mut reader: R) -> io::Result { match reader.read_u8()? { EMPTY_CHECKPOINT => Ok(Checkpoint::Empty), BRIDGE_CHECKPOINT => Ok(Checkpoint::AtIndex( - reader.read_u64::()? as usize, - read_bridge_v1(&mut reader)?, + reader.read_u64::()? as usize )), flag => Err(io::Error::new( io::ErrorKind::InvalidInput,