Merge branch 'master' into ring-0.14

* master: Update to jsonrpc-derive 10.0.2, fixes aliases bug (#10300)
openethereum · Feb 5, 2019 · 34aa00e · 34aa00e
2 parents 4557436 + 1b3b9b2
commit 34aa00e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -28,7 +28,7 @@ transient-hashmap = "0.4"
 itertools = "0.5"
 
 jsonrpc-core = "10.0.1"
-jsonrpc-derive = "10.0.1"
+jsonrpc-derive = "10.0.2"
 jsonrpc-http-server = "10.0.1"
 jsonrpc-ws-server = "10.0.1"
 jsonrpc-ipc-server = "10.0.1"

diff --git a/whisper/Cargo.toml b/whisper/Cargo.toml
@@ -26,5 +26,5 @@ smallvec = "0.6"
 tiny-keccak = "1.4"
 
 jsonrpc-core = "10.0.1"
-jsonrpc-derive = "10.0.1"
+jsonrpc-derive = "10.0.2"
 jsonrpc-pubsub = "10.0.1"