diff --git a/Cargo.lock b/Cargo.lock index 7448d0c..480810d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1759,9 +1759,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libm" @@ -2018,7 +2018,7 @@ dependencies = [ "digest 0.10.6", "multihash-derive", "sha2 0.10.6", - "sha3 0.10.7", + "sha3 0.10.8", "unsigned-varint 0.7.1", ] @@ -2396,9 +2396,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -2640,12 +2640,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - [[package]] name = "rustix" version = "0.36.13" @@ -3061,9 +3055,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ "digest 0.10.6", "keccak", @@ -3219,7 +3213,7 @@ dependencies = [ "byteorder", "digest 0.10.6", "sha2 0.10.6", - "sha3 0.10.7", + "sha3 0.10.8", "sp-std", "twox-hash", ] @@ -3582,7 +3576,6 @@ dependencies = [ "scale-info", "serde", "serde_json", - "treediff", "wasm-loader", "wasm-testbed", ] @@ -3897,16 +3890,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "treediff" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" -dependencies = [ - "rustc-serialize", - "serde_json", -] - [[package]] name = "trie-db" version = "0.27.1" diff --git a/libs/substrate-differ/Cargo.toml b/libs/substrate-differ/Cargo.toml index 2f31abc..1efed52 100644 --- a/libs/substrate-differ/Cargo.toml +++ b/libs/substrate-differ/Cargo.toml @@ -17,10 +17,6 @@ log = "0.4" num-format = "0.4" serde = { version = "1.0", features = ["derive", "rc"] } serde_json = "1.0" -treediff = { version = "4.0", features = [ - "with-serde-json", - "with-rustc-serialize", -] } wasm-testbed = { version = "1.0.0-alpha6", path = "../wasm-testbed" } scale-info = { version = "2.1.2", default-features = false, features = [ "derive", diff --git a/libs/substrate-differ/src/call_wrapper.rs b/libs/substrate-differ/src/call_wrapper.rs deleted file mode 100644 index 6ceb6fc..0000000 --- a/libs/substrate-differ/src/call_wrapper.rs +++ /dev/null @@ -1,30 +0,0 @@ -use std::fmt::Display; -use std::fmt::Write as _; -use treediff::tools::ChangeType; - -pub struct CallWrapper<'a, K, V: 'a>(pub &'a ChangeType<'a, K, V>); - -impl<'a, K: Display, V: Display + 'a> Display for CallWrapper<'a, K, V> { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match self.0 { - ChangeType::Modified(keys, v_before, v_after) => { - let mut res = String::new(); - for key in keys { - let _ = write!(res, "{key}."); - } - - write!(f, "🛠 {res:<50} {v_before:>20} --> {v_after}") - } - ChangeType::Removed(keys, val) => { - let mut res = String::new(); - for key in keys { - let _ = write!(res, "{key}."); - } - write!(f, "🗑 {res:<50} {val:>20}") - } - - ChangeType::Unchanged(_, _) => write!(f, "Unchanged"), - ChangeType::Added(_, _) => write!(f, "Added"), - } - } -} diff --git a/libs/substrate-differ/src/differs/raw_differ.rs b/libs/substrate-differ/src/differs/raw_differ.rs index b592bd3..03549ee 100644 --- a/libs/substrate-differ/src/differs/raw_differ.rs +++ b/libs/substrate-differ/src/differs/raw_differ.rs @@ -1,6 +1,5 @@ use super::{raw_differ_options::RawDifferOptions, skip_counter::SkipCounter}; use crate::{ - call_wrapper::CallWrapper, differs::{ change_counter::{ChangeCounter, ChangeType}, json_utils::json_collapse_byte_arrays, diff --git a/libs/substrate-differ/src/lib.rs b/libs/substrate-differ/src/lib.rs index 7e87462..5871e7c 100644 --- a/libs/substrate-differ/src/lib.rs +++ b/libs/substrate-differ/src/lib.rs @@ -3,5 +3,4 @@ //! ## Feature flags #![doc = document_features::document_features!()] -pub mod call_wrapper; pub mod differs;