Use rlp from crates

Move the rlp out of tree and use the crate from crates.io. Part of issue #8620.
openethereum · May 15, 2018 · e925965 · e925965
1 parent 8f56606
commit e925965
Show file tree

Hide file tree

Showing 38 changed files with 53 additions and 2,081 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,7 +46,7 @@ ethereum-types = "0.3"
 node-filter = { path = "ethcore/node_filter" }
 ethkey = { path = "ethkey" }
 node-health = { path = "dapps/node-health" }
-rlp = { path = "util/rlp" }
+rlp= "0.2.2"
 rpc-cli = { path = "rpc_cli" }
 parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }

diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -48,7 +48,7 @@ parity-machine = { path = "../machine" }
 parking_lot = "0.5"
 rayon = "1.0"
 rand = "0.4"
-rlp = { path = "../util/rlp" }
+rlp= "0.2.2"
 rlp_compress = { path = "../util/rlp_compress" }
 rlp_derive = { path = "../util/rlp_derive" }
 kvdb = { path = "../util/kvdb" }

diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
@@ -20,7 +20,7 @@ hashdb = { path = "../../util/hashdb" }
 heapsize = "0.4"
 vm = { path = "../vm" }
 plain_hasher = { path = "../../util/plain_hasher" }
-rlp = { path = "../../util/rlp" }
+rlp= "0.2.2"
 rlp_derive = { path = "../../util/rlp_derive" }
 smallvec = "0.4"
 futures = "0.1"

diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml
@@ -27,7 +27,7 @@ log = "0.3"
 parking_lot = "0.5"
 patricia-trie = { path = "../../util/patricia_trie" }
 rand = "0.3"
-rlp = { path = "../../util/rlp" }
+rlp= "0.2.2"
 rlp_derive = { path = "../../util/rlp_derive" }
 rustc-hex = "1.0"
 serde = "1.0"

diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml
@@ -17,7 +17,7 @@ ethcore-transaction = { path = "../transaction" }
 ethcore = { path = ".." }
 ethereum-types = "0.3"
 plain_hasher = { path = "../../util/plain_hasher" }
-rlp = { path = "../../util/rlp" }
+rlp= "0.2.2"
 rustc-hex = "1.0"
 keccak-hash = { path = "../../util/hash" }
 triehash = { path = "../../util/triehash" }

diff --git a/ethcore/transaction/Cargo.toml b/ethcore/transaction/Cargo.toml
@@ -10,7 +10,7 @@ ethkey = { path = "../../ethkey" }
 evm = { path = "../evm" }
 heapsize = "0.4"
 keccak-hash = { path = "../../util/hash" }
-rlp = { path = "../../util/rlp" }
+rlp= "0.2.2"
 unexpected = { path = "../../util/unexpected" }
 ethereum-types = "0.3"
 

diff --git a/ethcore/types/Cargo.toml b/ethcore/types/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-rlp = { path = "../../util/rlp" }
+rlp= "0.2.2"
 rlp_derive = { path = "../../util/rlp_derive" }
 ethcore-bytes = { path = "../../util/bytes" }
 ethereum-types = "0.3"

diff --git a/ethcore/vm/Cargo.toml b/ethcore/vm/Cargo.toml
@@ -11,5 +11,5 @@ patricia-trie = { path = "../../util/patricia_trie" }
 log = "0.3"
 common-types = { path = "../types" }
 ethjson = { path = "../../json" }
-rlp = { path = "../../util/rlp" }
+rlp= "0.2.2"
 keccak-hash = { path = "../../util/hash" }
diff --git a/ipfs/Cargo.toml b/ipfs/Cargo.toml
@@ -11,7 +11,7 @@ ethcore-bytes = { path = "../util/bytes" }
 ethereum-types = "0.3"
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
-rlp = { path = "../util/rlp" }
+rlp= "0.2.2"
 cid = "0.2"
 multihash = "0.7"
 unicase = "2.0"
diff --git a/local-store/Cargo.toml b/local-store/Cargo.toml
@@ -10,7 +10,7 @@ ethcore-io = { path = "../util/io" }
 ethcore-transaction = { path = "../ethcore/transaction" }
 kvdb = { path = "../util/kvdb" }
 log = "0.3"
-rlp = { path = "../util/rlp" }
+rlp= "0.2.2"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

diff --git a/miner/Cargo.toml b/miner/Cargo.toml
@@ -28,7 +28,7 @@ log = "0.3"
 parking_lot = "0.5"
 price-info = { path = "../price-info" }
 rayon = "1.0"
-rlp = { path = "../util/rlp" }
+rlp= "0.2.2"
 trace-time = { path = "../util/trace-time" }
 transaction-pool = { path = "../transaction-pool" }
 

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -60,7 +60,7 @@ parity-reactor = { path = "../util/reactor" }
 parity-updater = { path = "../updater" }
 parity-version = { path = "../util/version" }
 patricia-trie = { path = "../util/patricia_trie" }
-rlp = { path = "../util/rlp" }
+rlp= "0.2.2"
 stats = { path = "../util/stats" }
 vm = { path = "../ethcore/vm" }
 

diff --git a/util/error/Cargo.toml b/util/error/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-rlp = { path = "../rlp" }
+rlp= "0.2.2"
 kvdb = { path = "../kvdb" }
 ethereum-types = "0.3"
 error-chain = { version = "0.11", default-features = false }

diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml
@@ -15,7 +15,7 @@ log = "0.3"
 memorydb = { path = "../memorydb" }
 parking_lot = "0.5"
 plain_hasher = { path = "../plain_hasher" }
-rlp = { path = "../rlp" }
+rlp= "0.2.2"
 util-error = { path = "../error" }
 
 [dev-dependencies]

diff --git a/util/memorydb/Cargo.toml b/util/memorydb/Cargo.toml
@@ -12,4 +12,4 @@ ethereum-types = "0.3"
 keccak-hash = { version = "0.1.0", path = "../hash" }
 hashdb = { version = "0.1.1", path = "../hashdb" }
 plain_hasher = { path = "../plain_hasher" }
-rlp = { version = "0.2.1", path = "../rlp" }
+rlp= "0.2.2"
diff --git a/util/network-devp2p/Cargo.toml b/util/network-devp2p/Cargo.toml
@@ -26,7 +26,7 @@ ethcore-logger = { path ="../../logger" }
 ethcore-network = { path = "../network" }
 ethereum-types = "0.3"
 ethkey = { path = "../../ethkey" }
-rlp = { path = "../rlp" }
+rlp= "0.2.2"
 path = { path = "../path" }
 ipnetwork = "0.12.6"
 keccak-hash = { path = "../hash" }

diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml
@@ -13,5 +13,5 @@ ethcore-io = { path = "../io" }
 ethereum-types = "0.3"
 ethkey = { path = "../../ethkey" }
 ipnetwork = "0.12.6"
-rlp = { path = "../rlp" }
+rlp= "0.2.2"
 snappy = { git = "https://github.com/paritytech/rust-snappy" }