merge paritytech#3255

cheme · Apr 3, 2024 · ab327d2 · ab327d2
1 parent 3c3d6fc
commit ab327d2
Show file tree

Hide file tree

Showing 112 changed files with 3,289 additions and 3,064 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -600,7 +600,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 }
@@ -632,3 +631,7 @@ 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" }
+parity-db = { git = "https://github.com/paritytech/parity-db.git", branch = "master" }