Merge branch 'master' into refactor/triehash-generic-over-hasher

* master:
  Bump triehash to v0.1.1
  Prepare triehash for cargo publication
This commit is contained in:
David Palm 2018-07-06 19:32:43 +02:00
commit 2b195f04aa
3 changed files with 7 additions and 7 deletions

View File

@ -16,10 +16,10 @@ parity-bytes = { version = "0.1.0", path = "../parity-bytes" }
[dev-dependencies]
env_logger = "0.5"
ethereum-types = "0.3"
keccak-hash = { path = "../keccak-hash" }
keccak-hash = { version = "0.1", path = "../keccak-hash" }
memorydb = { version = "0.2", path = "../memorydb" }
rlp = { version = "0.2.1", path = "../rlp" }
trie-standardmap = { path = "../trie-standardmap" }
trie-standardmap = { version = "0.1", path = "../trie-standardmap" }
triehash = { version = "0.2", path = "../triehash" }
# REVIEW: what's a better way to deal with this? The tests here in

View File

@ -6,6 +6,6 @@ description = "Standard test map for profiling tries"
[dependencies]
ethereum-types = "0.3"
keccak-hash = { path = "../keccak-hash" }
keccak-hash = { version = "0.1", path = "../keccak-hash" }
parity-bytes = { path = "../parity-bytes" }
rlp = { path = "../rlp" }

View File

@ -3,14 +3,14 @@ name = "triehash"
version = "0.2.0"
authors = ["Parity Technologies <admin@parity.io>"]
description = "in memory patricia trie operations"
repository = "https://github.com/paritytech/parity-common"
license = "GPL-3.0"
[dependencies]
elastic-array = "0.10"
ethereum-types = "0.3"
hashdb = { path = "../hashdb" }
rlp = { path = "../rlp" }
hashdb = { version = "0.2", "path = "../hashdb" }
rlp = { version = "0.2.1", path = "../rlp" }
[dev-dependencies]
trie-standardmap = { path = "../trie-standardmap" }
keccak-hasher = { path = "../test-support/keccak-hasher" }
trie-standardmap = { version = "0.1", path = "../trie-standardmap" }