Skip to content
Snippets Groups Projects
Commit 83294484 authored by cheme's avatar cheme
Browse files

Merge branch 'master' into child_trie_w3_change

parents 728aedfa aa15e17a
Branches
No related merge requests found
This diff is collapsed.
......@@ -29,7 +29,7 @@ parking_lot = { version = "0.10.0", optional = true }
sp-debug-derive = { version = "2.0.0", path = "../debug-derive" }
sp-externalities = { version = "0.8.0", optional = true, path = "../externalities" }
sp-storage = { version = "2.0.0", default-features = false, path = "../storage" }
libsecp256k1 = { version = "0.3.2", default-features = false }
libsecp256k1 = { version = "0.3.2", default-features = false, features = ["hmac"] }
parity-util-mem = { version = "0.5.1", default-features = false, features = ["primitive-types"] }
# full crypto
......
......@@ -405,13 +405,13 @@ impl From<&'static str> for DispatchError {
}
}
impl Into<&'static str> for DispatchError {
fn into(self) -> &'static str {
match self {
Self::Other(msg) => msg,
Self::CannotLookup => "Can not lookup",
Self::BadOrigin => "Bad origin",
Self::Module { message, .. } => message.unwrap_or("Unknown module error"),
impl From<DispatchError> for &'static str {
fn from(err: DispatchError) -> &'static str {
match err {
DispatchError::Other(msg) => msg,
DispatchError::CannotLookup => "Can not lookup",
DispatchError::BadOrigin => "Bad origin",
DispatchError::Module { message, .. } => message.unwrap_or("Unknown module error"),
}
}
}
......
......@@ -15,13 +15,13 @@ harness = false
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
sp-std = { version = "2.0.0", default-features = false, path = "../std" }
hash-db = { version = "0.15.2", default-features = false }
trie-db = { version = "0.19.2", default-features = false }
trie-root = { version = "0.15.2", default-features = false }
memory-db = { version = "0.18.1", default-features = false }
trie-db = { version = "0.20.0", default-features = false }
trie-root = { version = "0.16.0", default-features = false }
memory-db = { version = "0.19.0", default-features = false }
sp-core = { version = "2.0.0", default-features = false, path = "../core" }
[dev-dependencies]
trie-bench = "0.19.0"
trie-bench = "0.20.0"
trie-standardmap = "0.15.2"
criterion = "0.2.11"
hex-literal = "0.2.1"
......
......@@ -17,7 +17,7 @@ frame-executive = { version = "2.0.0", default-features = false, path = "../../f
sp-inherents = { version = "2.0.0", default-features = false, path = "../../primitives/inherents" }
sp-keyring = { version = "2.0.0", optional = true, path = "../../primitives/keyring" }
log = { version = "0.4.8", optional = true }
memory-db = { version = "0.18.0", default-features = false }
memory-db = { version = "0.19.0", default-features = false }
sp-offchain = { path = "../../primitives/offchain", default-features = false}
sp-core = { version = "2.0.0", default-features = false, path = "../../primitives/core" }
sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
......@@ -36,7 +36,7 @@ pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../
sc-client = { version = "0.8", optional = true, path = "../../client" }
sp-trie = { version = "2.0.0", default-features = false, path = "../../primitives/trie" }
sp-transaction-pool = { version = "2.0.0", default-features = false, path = "../../primitives/transaction-pool" }
trie-db = { version = "0.19.2", default-features = false }
trie-db = { version = "0.20.0", default-features = false }
parity-util-mem = { version = "0.5.1", default-features = false, features = ["primitive-types"] }
[dev-dependencies]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment