diff --git a/algae/Cargo.toml b/algae/Cargo.toml index b7830c4..bb0ece4 100644 --- a/algae/Cargo.toml +++ b/algae/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" name = "algae" readme = "README.md" repository = "https://github.com/scattered-systems/algae" -version = "0.1.16" # TODO - Update the cargo package version +version = "0.1.17" # TODO - Update the cargo package version [features] default = ["core", "graph", "merkle", "mmr"] @@ -33,17 +33,17 @@ serde_json = "1" [dependencies.algae-graph] optional = true path = "../graph" -version = "0.1.16" +version = "0.1.17" [dependencies.algae-merkle] optional = true path = "../merkle" -version = "0.1.16" +version = "0.1.17" [dependencies.algae-mmr] optional = true path = "../mmr" -version = "0.1.16" +version = "0.1.17" [package.metadata.docs.rs] diff --git a/graph/Cargo.toml b/graph/Cargo.toml index 5c47546..c819f1b 100644 --- a/graph/Cargo.toml +++ b/graph/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" name = "algae-graph" readme = "README.md" repository = "https://github.com/scattered-systems/algae" -version = "0.1.16" # TODO - Update the cargo package version +version = "0.1.17" # TODO - Update the cargo package version [lib] crate-type = ["cdylib", "rlib"] @@ -19,7 +19,9 @@ crate-type = ["cdylib", "rlib"] [dev-dependencies] [dependencies] -itertools = "0.10.5" +decanter = { features = ["derive"], version = "0.1.2" } scsys = { features = ["full"], version = "0.1.40" } + +itertools = "0.10.5" serde = { features = ["derive"], version = "1" } serde_json = "1" diff --git a/merkle/Cargo.toml b/merkle/Cargo.toml index 754f271..5535210 100644 --- a/merkle/Cargo.toml +++ b/merkle/Cargo.toml @@ -9,21 +9,30 @@ license = "Apache-2.0" name = "algae-merkle" readme = "README.md" repository = "https://github.com/scattered-systems/algae" -version = "0.1.16" # TODO - Update the cargo package version +version = "0.1.17" # TODO - Update the cargo package version [features] - +default = [ + "ring/default" +] +wasm = [ + "decanter/wasm", + "ring/wasm32_c" +] [lib] crate-type = ["cdylib", "rlib"] test = true [dependencies] +decanter = { features = ["derive", "wasm"], version = "0.1.2" } +# scsys = { features = ["full"], version = "0.1.40" } + +anyhow = "1" hex = "0.4" itertools = "0.10" log = "0.4" -ring = { features = ["wasm32_c"], version = "0.16.20" } -scsys = { features = ["full"], version = "0.1.40" } +ring = { features = ["wasm32_c"], version = "0.16" } serde = { features = ["derive"], version = "1" } serde_json = "1" diff --git a/merkle/src/components/layers/mod.rs b/merkle/src/components/layers/mod.rs deleted file mode 100644 index 5788928..0000000 --- a/merkle/src/components/layers/mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -/* - Appellation: layers - Contrib: FL03 - Description: ... summary ... -*/ -pub use self::layer::*; - -pub(crate) mod layer; diff --git a/merkle/src/components/mod.rs b/merkle/src/components/mod.rs deleted file mode 100644 index db28832..0000000 --- a/merkle/src/components/mod.rs +++ /dev/null @@ -1,11 +0,0 @@ -/* - Appellation: node - Contrib: FL03 - Description: ... summary ... -*/ -pub use self::{layers::*, nodes::*, payloads::*, trees::*}; - -pub(crate) mod layers; -pub(crate) mod nodes; -pub(crate) mod payloads; -pub(crate) mod trees; diff --git a/merkle/src/components/nodes/mod.rs b/merkle/src/components/nodes/mod.rs deleted file mode 100644 index f4b5397..0000000 --- a/merkle/src/components/nodes/mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -/* - Appellation: node - Contrib: FL03 - Description: ... summary ... -*/ -pub use self::node::*; - -pub(crate) mod node; diff --git a/merkle/src/components/payloads/mod.rs b/merkle/src/components/payloads/mod.rs deleted file mode 100644 index d4f96c4..0000000 --- a/merkle/src/components/payloads/mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -/* - Appellation: node - Contrib: FL03 - Description: ... summary ... -*/ -pub use self::payload::*; - -pub(crate) mod payload; diff --git a/merkle/src/core/mod.rs b/merkle/src/core/mod.rs deleted file mode 100644 index 6799fcc..0000000 --- a/merkle/src/core/mod.rs +++ /dev/null @@ -1,9 +0,0 @@ -/* - Appellation: cmps - Contrib: FL03 - Description: Implements the components of a merkle tree -*/ -pub use self::{primitives::*, utils::*}; - -pub(crate) mod primitives; -pub(crate) mod utils; diff --git a/merkle/src/core/utils/generate.rs b/merkle/src/core/utils/generate.rs deleted file mode 100644 index d58bf4e..0000000 --- a/merkle/src/core/utils/generate.rs +++ /dev/null @@ -1,5 +0,0 @@ -/* - Appellation: generate - Contrib: FL03 - Description: -*/ diff --git a/merkle/src/data/mod.rs b/merkle/src/data/mod.rs deleted file mode 100644 index d3d3a5e..0000000 --- a/merkle/src/data/mod.rs +++ /dev/null @@ -1,10 +0,0 @@ -/* - Appellation: data - Contrib: FL03 - Description: - This module implements a host of proofs for the implemented data-structure (merkle tree) -*/ -pub use self::shape::*; - -pub mod proofs; -pub(crate) mod shape; diff --git a/merkle/src/components/layers/layer.rs b/merkle/src/layers.rs similarity index 96% rename from merkle/src/components/layers/layer.rs rename to merkle/src/layers.rs index 1b58509..f5b090e 100644 --- a/merkle/src/components/layers/layer.rs +++ b/merkle/src/layers.rs @@ -4,7 +4,7 @@ Description: Merkle Tree def... */ -use crate::components::nodes::Node; +use crate::Node; use itertools::Itertools; use serde::{Deserialize, Serialize}; use std::string::ToString; diff --git a/merkle/src/lib.rs b/merkle/src/lib.rs index 440fbce..fbebbe9 100644 --- a/merkle/src/lib.rs +++ b/merkle/src/lib.rs @@ -6,8 +6,14 @@ #[cfg(test)] extern crate hex_literal; #[doc(inline)] -pub use self::{components::*, core::*, data::*}; +pub use self::{layers::*, nodes::*, payloads::*, primitives::*, shape::*, trees::*, utils::*}; -pub(crate) mod components; -pub(crate) mod core; -pub(crate) mod data; +pub(crate) mod layers; +pub(crate) mod nodes; +pub(crate) mod payloads; +pub(crate) mod primitives; +pub(crate) mod shape; +pub(crate) mod trees; +pub(crate) mod utils; + +pub mod proofs; diff --git a/merkle/src/components/nodes/node.rs b/merkle/src/nodes.rs similarity index 96% rename from merkle/src/components/nodes/node.rs rename to merkle/src/nodes.rs index 4fe14af..7ae9ef9 100644 --- a/merkle/src/components/nodes/node.rs +++ b/merkle/src/nodes.rs @@ -4,7 +4,7 @@ Description: ... Summary ... */ use crate::{combine, merkle_hash, Payload}; -use scsys::prelude::{Hashable, H256}; +use decanter::prelude::{Hashable, H256}; use serde::{Deserialize, Serialize}; use std::string::ToString; diff --git a/merkle/src/components/payloads/payload.rs b/merkle/src/payloads.rs similarity index 100% rename from merkle/src/components/payloads/payload.rs rename to merkle/src/payloads.rs diff --git a/merkle/src/core/primitives.rs b/merkle/src/primitives.rs similarity index 100% rename from merkle/src/core/primitives.rs rename to merkle/src/primitives.rs diff --git a/merkle/src/data/proofs/mod.rs b/merkle/src/proofs/mod.rs similarity index 100% rename from merkle/src/data/proofs/mod.rs rename to merkle/src/proofs/mod.rs diff --git a/merkle/src/data/proofs/path.rs b/merkle/src/proofs/path.rs similarity index 100% rename from merkle/src/data/proofs/path.rs rename to merkle/src/proofs/path.rs diff --git a/merkle/src/data/proofs/proof.rs b/merkle/src/proofs/proof.rs similarity index 95% rename from merkle/src/data/proofs/proof.rs rename to merkle/src/proofs/proof.rs index 1c8f508..037d0d3 100644 --- a/merkle/src/data/proofs/proof.rs +++ b/merkle/src/proofs/proof.rs @@ -5,7 +5,7 @@ */ use super::path::proof_path; use crate::MerkleDimension; -use scsys::prelude::H256; +use decanter::prelude::H256; // Returns the proof for the given index pub fn merkle_proof(dim: MerkleDimension, nodes: Vec, index: usize) -> Vec { diff --git a/merkle/src/data/shape.rs b/merkle/src/shape.rs similarity index 100% rename from merkle/src/data/shape.rs rename to merkle/src/shape.rs diff --git a/merkle/src/components/trees/interface.rs b/merkle/src/trees/interface.rs similarity index 92% rename from merkle/src/components/trees/interface.rs rename to merkle/src/trees/interface.rs index 57bfcba..ece2c4f 100644 --- a/merkle/src/components/trees/interface.rs +++ b/merkle/src/trees/interface.rs @@ -4,8 +4,8 @@ Description: Merkle Tree def... */ -use crate::components::{layers::Layer, nodes::Node}; -use scsys::prelude::{Hashable, H256}; +use crate::{Layer, Node}; +use decanter::prelude::{Hashable, H256}; use serde::{Deserialize, Serialize}; use std::string::ToString; diff --git a/merkle/src/components/trees/mod.rs b/merkle/src/trees/mod.rs similarity index 96% rename from merkle/src/components/trees/mod.rs rename to merkle/src/trees/mod.rs index c15f9cf..d13c92e 100644 --- a/merkle/src/components/trees/mod.rs +++ b/merkle/src/trees/mod.rs @@ -9,7 +9,7 @@ pub(crate) mod interface; pub(crate) mod tree; use crate::{proofs::merkle_proof, MerkleDimension, MerkleShape}; -use scsys::prelude::{Hashable, H256}; +use decanter::prelude::{Hashable, H256}; pub trait MerkleTreeWrapper { fn new(dim: MerkleDimension, nodes: Vec) -> Self; @@ -45,7 +45,7 @@ pub trait MerkleTreeWrapperExt: MerkleTreeWrapper { } pub(crate) mod utils { use crate::{add_hash, MerkleDimension, MerkleShape}; - use scsys::prelude::{Hashable, H256}; + use decanter::prelude::{Hashable, H256}; pub fn create_merkle_tree(data: &[T]) -> (Box, Vec) where diff --git a/merkle/src/components/trees/tree.rs b/merkle/src/trees/tree.rs similarity index 97% rename from merkle/src/components/trees/tree.rs rename to merkle/src/trees/tree.rs index 34dd68f..ed0e573 100644 --- a/merkle/src/components/trees/tree.rs +++ b/merkle/src/trees/tree.rs @@ -7,7 +7,7 @@ use crate::{ create_merkle_tree, proofs::merkle_proof, MerkleDimension, MerkleShape, MerkleTreeWrapper, MerkleTreeWrapperExt, }; -use scsys::prelude::{Hashable, H256}; +use decanter::prelude::{Hashable, H256}; #[derive(Debug, Default)] pub struct MerkleTree { diff --git a/merkle/src/core/utils/misc.rs b/merkle/src/utils/misc.rs similarity index 94% rename from merkle/src/core/utils/misc.rs rename to merkle/src/utils/misc.rs index dcc8611..cb1665d 100644 --- a/merkle/src/core/utils/misc.rs +++ b/merkle/src/utils/misc.rs @@ -3,7 +3,7 @@ Contrib: FL03 Description: */ -use scsys::prelude::{hasher, H256}; +use decanter::prelude::{hasher, H256}; use serde::Serialize; /// diff --git a/merkle/src/core/utils/mod.rs b/merkle/src/utils/mod.rs similarity index 65% rename from merkle/src/core/utils/mod.rs rename to merkle/src/utils/mod.rs index 8683673..323619f 100644 --- a/merkle/src/core/utils/mod.rs +++ b/merkle/src/utils/mod.rs @@ -3,8 +3,7 @@ Contrib: FL03 Description: */ -pub use self::{generate::*, misc::*, validate::*}; +pub use self::{misc::*, validate::*}; -pub(crate) mod generate; pub(crate) mod misc; pub(crate) mod validate; diff --git a/merkle/src/core/utils/validate.rs b/merkle/src/utils/validate.rs similarity index 96% rename from merkle/src/core/utils/validate.rs rename to merkle/src/utils/validate.rs index 338f061..eeb6ab2 100644 --- a/merkle/src/core/utils/validate.rs +++ b/merkle/src/utils/validate.rs @@ -4,7 +4,7 @@ Description: */ use crate::{add_hash, proofs::proof_path}; -use scsys::prelude::H256; +use decanter::prelude::H256; /// Verify that the datum hash with a vector of proofs will produce the Merkle root. Also need the /// index of datum and `leaf_size`, the total number of leaves. diff --git a/merkle/tests/merkle.rs b/merkle/tests/merkle.rs index e603597..732c8bd 100644 --- a/merkle/tests/merkle.rs +++ b/merkle/tests/merkle.rs @@ -2,94 +2,92 @@ TODO: Update the hashes to match the Blake3 Hash Digests */ #[cfg(test)] -mod tests { - /* - Map(A -> a) - def. - This notation abbreviates a is the hash of A; more formally, (A) maps to the hash (a) by the hashing function H - */ - use algae_merkle::{is_merkle_valid, MerkleTree, MerkleTreeWrapper}; - use hex_literal::hex; - use scsys::prelude::{Hashable, H256}; +/* + Map(A -> a) + def. + This notation abbreviates a is the hash of A; more formally, (A) maps to the hash (a) by the hashing function H +*/ +use algae_merkle::{is_merkle_valid, MerkleTree, MerkleTreeWrapper}; +use decanter::prelude::{Hashable, H256}; +use hex_literal::hex; - macro_rules! gen_merkle_tree_data { - () => {{ - vec![ - (hex!("0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d")).into(), - (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), - ] - }}; - } +macro_rules! gen_merkle_tree_data { + () => {{ + vec![ + (hex!("0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d")).into(), + (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), + ] + }}; +} - macro_rules! gen_merkle_tree_data2 { - () => {{ - vec![ - (hex!("0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d")).into(), - (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), - (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), - (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), - (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), - ] - }}; - } +macro_rules! gen_merkle_tree_data2 { + () => {{ + vec![ + (hex!("0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d")).into(), + (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), + (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), + (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), + (hex!("0101010101010101010101010101010101010101010101010101010101010202")).into(), + ] + }}; +} - /* - A -> a: ("0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d", "b69566be6e1720872f73651d1851a0eae0060a132cf0f64a0ffaea248de6cba0") - B -> b: ("0101010101010101010101010101010101010101010101010101010101010202", "965b093a75a75895a351786dd7a188515173f6928a8af8c9baa4dcff268a4f0f") - C -> c: (concat(a, b), 6b787718210e0b3b608814e04e61fde06d0df794319a12162f287412df3ec920") where a ahead of b - */ - #[test] - fn test_merkle_root() { - let data: Vec = gen_merkle_tree_data!(); - let expected = - (hex!("6b787718210e0b3b608814e04e61fde06d0df794319a12162f287412df3ec920")).into(); - let a = MerkleTree::from(data); - assert_ne!(&a.root(), &expected); - } +/* + A -> a: ("0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d0a0b0c0d0e0f0e0d", "b69566be6e1720872f73651d1851a0eae0060a132cf0f64a0ffaea248de6cba0") + B -> b: ("0101010101010101010101010101010101010101010101010101010101010202", "965b093a75a75895a351786dd7a188515173f6928a8af8c9baa4dcff268a4f0f") + C -> c: (concat(a, b), 6b787718210e0b3b608814e04e61fde06d0df794319a12162f287412df3ec920") where a ahead of b +*/ +#[test] +fn test_merkle_root() { + let data: Vec = gen_merkle_tree_data!(); + let expected = + (hex!("6b787718210e0b3b608814e04e61fde06d0df794319a12162f287412df3ec920")).into(); + let a = MerkleTree::from(data); + assert_ne!(&a.root(), &expected); +} - /* - A -> a: ("0101010101010101010101010101010101010101010101010101010101010202", "965b093a75a75895a351786dd7a188515173f6928a8af8c9baa4dcff268a4f0f") - */ - #[test] - fn test_merkle_proof() { - let expected = - vec![hex!("965b093a75a75895a351786dd7a188515173f6928a8af8c9baa4dcff268a4f0f").into()]; +/* + A -> a: ("0101010101010101010101010101010101010101010101010101010101010202", "965b093a75a75895a351786dd7a188515173f6928a8af8c9baa4dcff268a4f0f") +*/ +#[test] +fn test_merkle_proof() { + let expected = + vec![hex!("965b093a75a75895a351786dd7a188515173f6928a8af8c9baa4dcff268a4f0f").into()]; - let a = MerkleTree::from(gen_merkle_tree_data!()); + let a = MerkleTree::from(gen_merkle_tree_data!()); - assert_ne!(a.proof(0), expected) - } + assert_ne!(a.proof(0), expected) +} - /* - A -> a: ("0101010101010101010101010101010101010101010101010101010101010202", "965b093a75a75895a351786dd7a188515173f6928a8af8c9baa4dcff268a4f0f") - */ - #[test] - fn test_is_merkle_valid() { - let data: Vec = gen_merkle_tree_data2!(); - let merkle_tree = MerkleTree::from(data.clone()); - let index = 3; - let proof = merkle_tree.proof(index); - log::info!("{:?}", proof); - assert!(is_merkle_valid( - &merkle_tree.root(), - &data[index].hash(), - &proof, - index, - data.len() - )); - } +/* + A -> a: ("0101010101010101010101010101010101010101010101010101010101010202", "965b093a75a75895a351786dd7a188515173f6928a8af8c9baa4dcff268a4f0f") +*/ +#[test] +fn test_is_merkle_valid() { + let data: Vec = gen_merkle_tree_data2!(); + let merkle_tree = MerkleTree::from(data.clone()); + let index = 3; + let proof = merkle_tree.proof(index); + log::info!("{:?}", proof); + assert!(is_merkle_valid( + &merkle_tree.root(), + &data[index].hash(), + &proof, + index, + data.len() + )); +} - #[test] - fn test_vrf_tree() { - let data: Vec = gen_merkle_tree_data!(); - let merkle_tree = MerkleTree::from(data.clone()); - let proof = merkle_tree.proof(0); - assert!(is_merkle_valid( - &merkle_tree.root(), - &data[0].hash(), - &proof, - 0, - data.len() - )); - } +#[test] +fn test_vrf_tree() { + let data: Vec = gen_merkle_tree_data!(); + let merkle_tree = MerkleTree::from(data.clone()); + let proof = merkle_tree.proof(0); + assert!(is_merkle_valid( + &merkle_tree.root(), + &data[0].hash(), + &proof, + 0, + data.len() + )); } diff --git a/mmr/Cargo.toml b/mmr/Cargo.toml index abf1495..902b4ec 100644 --- a/mmr/Cargo.toml +++ b/mmr/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" name = "algae-mmr" readme = "README.md" repository = "https://github.com/scattered-systems/algae" -version = "0.1.16" # TODO - Update the cargo package version +version = "0.1.17" # TODO - Update the cargo package version [features] @@ -19,14 +19,17 @@ crate-type = ["cdylib", "rlib"] test = true [dependencies] +decanter = { features = ["derive"], version = "0.1.2" } + +anyhow = "1" digest = "0.10" hex = "0.4" itertools = "0.10" -scsys = { features = ["full"], version = "0.1.40" } serde = { features = ["derive"], version = "1" } serde_json = "1" [dev-dependencies] +scsys = { default-features = false, features = ["gen"], version = "0.1.40" } hex-literal = "0.3.4" vrf = "0.2.4" diff --git a/mmr/src/actors/builders/builder.rs b/mmr/src/actors/builders/builder.rs index c64e747..0bc3970 100644 --- a/mmr/src/actors/builders/builder.rs +++ b/mmr/src/actors/builders/builder.rs @@ -4,7 +4,7 @@ Description: ... summary ... */ use crate::MerkleMountainRange; -use scsys::prelude::Hashable; +use decanter::prelude::Hashable; pub struct MerkleMountainRangeBuilder { pub mmr: MerkleMountainRange, diff --git a/mmr/src/cmps/nodes/node.rs b/mmr/src/cmps/nodes/node.rs index e86dcf3..b7e988d 100644 --- a/mmr/src/cmps/nodes/node.rs +++ b/mmr/src/cmps/nodes/node.rs @@ -4,7 +4,7 @@ Description: ... summary ... */ -use scsys::prelude::H256; +use decanter::prelude::H256; use serde::{Deserialize, Serialize}; use std::convert::From; diff --git a/mmr/src/cmps/payloads/payload.rs b/mmr/src/cmps/payloads/payload.rs index 1f45dc6..729a2f9 100644 --- a/mmr/src/cmps/payloads/payload.rs +++ b/mmr/src/cmps/payloads/payload.rs @@ -3,8 +3,7 @@ Contrib: FL03 Description: ... summary ... */ -use scsys::crypto::{hasher, H256}; -use scsys::prelude::Hashable; +use decanter::prelude::{hasher, Hashable, H256}; use serde::{Deserialize, Serialize}; use std::{collections::HashMap, convert::From}; diff --git a/mmr/src/cmps/positions/position.rs b/mmr/src/cmps/positions/position.rs index b460c6a..9f629b0 100644 --- a/mmr/src/cmps/positions/position.rs +++ b/mmr/src/cmps/positions/position.rs @@ -3,7 +3,7 @@ Contrib: FL03 Description: ... summary ... */ -use scsys::prelude::{hasher, Hashable, H256}; +use decanter::prelude::{hasher, Hashable, H256}; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] diff --git a/mmr/src/core/errors/error.rs b/mmr/src/core/errors/error.rs deleted file mode 100644 index d0b1293..0000000 --- a/mmr/src/core/errors/error.rs +++ /dev/null @@ -1,5 +0,0 @@ -/* - Appellation: errors - Contrib: FL03 - Description: -*/ diff --git a/mmr/src/core/errors/mod.rs b/mmr/src/core/errors/mod.rs deleted file mode 100644 index dfaed35..0000000 --- a/mmr/src/core/errors/mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -/* - Appellation: errors - Contrib: FL03 - Description: ... summary ... -*/ -pub use self::error::*; - -pub(crate) mod error; diff --git a/mmr/src/core/mmr.rs b/mmr/src/core/mmr.rs index 750c4a7..bd3f71a 100644 --- a/mmr/src/core/mmr.rs +++ b/mmr/src/core/mmr.rs @@ -6,8 +6,8 @@ use crate::{ is_node_right, nodes::MerkleNode, payloads::RangeMap, positions::Position, sibling_index, }; +use decanter::prelude::{hasher, Hashable, H256}; use digest::Digest; -use scsys::prelude::{hasher, Hashable, H256}; use serde::{Deserialize, Serialize}; use std::convert::From; diff --git a/mmr/src/core/mod.rs b/mmr/src/core/mod.rs index 95e6308..10b1442 100644 --- a/mmr/src/core/mod.rs +++ b/mmr/src/core/mod.rs @@ -5,7 +5,6 @@ */ pub use self::{mmr::*, primitives::*, utils::*}; -pub mod errors; pub(crate) mod mmr; pub(crate) mod utils; diff --git a/mmr/src/data/stores/store.rs b/mmr/src/data/stores/store.rs index 7e30e17..c85658a 100644 --- a/mmr/src/data/stores/store.rs +++ b/mmr/src/data/stores/store.rs @@ -3,7 +3,7 @@ Contrib: FL03 Description: ... summary ... */ -use scsys::prelude::{hasher, Hashable, H256}; +use decanter::prelude::{hasher, Hashable, H256}; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]