merge paritytech#3255

cheme · Apr 17, 2024 · 743ee48 · 743ee48
1 parent 7049c3c
commit 743ee48
Show file tree

Hide file tree

Showing 110 changed files with 3,275 additions and 3,044 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -601,7 +601,6 @@ curve25519-dalek = { opt-level = 3 }
 ed25519-dalek = { opt-level = 3 }
 flate2 = { opt-level = 3 }
 futures-channel = { opt-level = 3 }
-hash-db = { opt-level = 3 }
 hashbrown = { opt-level = 3 }
 hmac = { opt-level = 3 }
 httparse = { opt-level = 3 }
@@ -633,3 +632,8 @@ wasmi = { opt-level = 3 }
 x25519-dalek = { opt-level = 3 }
 yamux = { opt-level = 3 }
 zeroize = { opt-level = 3 }
+
+[patch.crates-io]
+#subtrie = { git = "https://github.com/paritytech/subtrie.git", branch = "master" }
+subtrie = { git = "https://github.com/cheme/trie.git", branch = "cheme/new-trie" }
+parity-db = { git = "https://github.com/paritytech/parity-db.git", branch = "master" }