Use crates from parity-common #9058

dvdplm · 2018-07-06T11:43:13Z

Update parity-ethereum to use the new parity-common repo. In this PR the dependencies are fetched via the-crate = { git = "…" } rather than from crates.io as they are not all published/updated.

This affects the following crates in parity-ethereum:

hashdb
keccak-hash
kvdb
kvdb-rocksdb
memorydb
parity-bytes
parity-crypto
path
patricia_trie
plain_hasher
rlp
target
trie-standardmap
triehash

The crates above are not deleted from parity-ethereum to allow pending PRs to be merged without too much merge conflicts fun.

* master: remove util-error (#9054)

* master: fetch: replace futures-timer with tokio-timer (#9066)

Specific rev

niklasad1 · 2018-07-10T07:17:28Z

Cargo.toml

@@ -133,6 +133,7 @@ members = [
 	"transaction-pool",
 	"whisper",
 	"whisper/cli",
+  "util/triehash-ethereum",


Missing tab!

niklasad1 · 2018-07-10T07:27:17Z

util/triehash-ethereum/src/lib.rs

+where
+    I: IntoIterator<Item = (A, B)>,
+    A: AsRef<[u8]>,
+    B: AsRef<[u8]>,


redundant trait bounds i.e, A and B is referring to the same trait!

If this is for readability I would want these to be changed to (K, V) instead because they are referring to Key, Value right?

K/V makes sense, changing that. Not sure how to remove the bound though, can you show me how? Without the bound the call to triehash::sec_trie_root() does not work. Do you know a better way?

well my first comment is that you could do:

pub fn sec_trie_root<I, A>(input: I) -> H256 where I: IntoIterator<Item = (A, A)>, A: AsRef<[u8]>, {}

Otherwise this is also ok IMO:

pub fn sec_trie_root<I, K, V>(input: I) -> H256 where I: IntoIterator<Item = (K, V)>, K: AsRef<[u8]>, V: AsRef<[u8]>, {}

@niklasad1 that's not true. Right now, A and B can be different types (and they, very often are), whereas in your snippet they need to be exactly the same type

@niklasad1 it's probably easier to see if you look at the actual sec_trie_root() method here – this little crate here is just a "proxy" to the real deal.

@debris @dvdplm Marek is right even if the types are [u8; 4] and [u8; 16] it wouldn't compile because they are different types so ignore me and continue :)

ignore me

Never! It was a great q, forced me to think.

and continue

So that's a thumbs-up from you? ;)

* master: Clean up deprecated options and add CHECK macro (#9036) Replace `std::env::home_dir` with `dirs::home_dir` (#9077) fix warning in secret-store test (#9074) SeedHashCompute remove needless `new` impl (#9063) remove trait bounds from several structs (#9055) docs: add changelog for 1.10.9 stable and 1.11.6 beta (#9069) Enable test in `miner/pool/test` (#9072)

debris · 2018-07-10T08:40:02Z

Cargo.toml

@@ -33,7 +33,7 @@ fdlimit = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 ethcore = { path = "ethcore", features = ["work-notify", "price-info", "stratum"] }
-ethcore-bytes = { path = "util/bytes" }
+parity-bytes = { git = "https://github.com/paritytech/parity-common", rev = "1803c0f" }


please remove rev from Cargo.toml. Version is already locked in Cargo.lock file. This field will only force us to use sed before every dependency update

Yes, it's terrible. It's here because I could not for the world convince cargo to go out and fetch the latest version from git. When there are mismatching versions (or when rustc thinks the versions don't match) errors pop up like popcorn.

Do you happen to know how to force cargo to do a git fetch?

My plan here was to get the PR reviewed and then remove the rev = … as the last step before merging. In a follow-up PR I'll remove the crates now moved to parity-common and switch to using them from crates.io if I can't get git updates to work as expected.

Do you happen to know how to force cargo to do a git fetch?

For jsonrpc crates it's enough to do cargo update -p X, where X is the name of one of the crates from jsonrpc repo

Ok, it's possible that I messed up (I did discover one instance of a crate getting fetched with path so perhaps that's what tripped me up yesterday).

I'll remove the rev so we can merge this and then we'll see what happens when ppl star using it.

dvdplm added 4 commits July 6, 2018 13:04

Use crates from parity-common

5298e5b

Use parity-common

6d085a2

Use parity-common

fceab9d

Fix extern crate and use statements for renamed crates

58d4686

dvdplm self-assigned this Jul 6, 2018

dvdplm added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. M4-core ⛓ Core client code / Rust. M5-dependencies 🖇 Dependencies. F5-task 🎬 Generic label for things that just have to get done but are no issues in first place. labels Jul 6, 2018

5chdn added this to the 2.0 milestone Jul 6, 2018

dvdplm added 2 commits July 6, 2018 19:08

Merge branch 'master' into chore/use-parity-common

9b0a120

* master: remove util-error (#9054)

Fix Cargo.lock

abce585

5chdn removed the F5-task 🎬 Generic label for things that just have to get done but are no issues in first place. label Jul 8, 2018

dvdplm added 12 commits July 9, 2018 13:07

Merge branch 'master' into chore/use-parity-common

accc881

* master: fetch: replace futures-timer with tokio-timer (#9066)

Add helper crate to ease the pain of dealing with trie roots

c7c0885

Add triehash-ethereum to workspace

4903024

Cargo.lock updates

fe76e76

Fetch triehash from git

c67fc71

Use triehash-ethereum in ethcore/sync

eb666fb

Fix funny indentation

f9a322b

Use specific rev to force update

0227c12

specific rev

965869b

Use the triehash-ethereum helper crate

40e1a08

Specific rev

Use specific rev

4e258f7

Load kvdb-memorydb from parity-common

7e86cda

niklasad1 reviewed Jul 10, 2018

View reviewed changes

dvdplm added 2 commits July 10, 2018 09:37

whitespace

00cfa9c

dvdplm requested a review from debris July 10, 2018 08:38

debris reviewed Jul 10, 2018

View reviewed changes

dvdplm added 2 commits July 10, 2018 11:03

Remove rev key and trust the git

bddca07

lock

2b30f11

dvdplm mentioned this pull request Jul 10, 2018

Delete crates from parity-ethereum and fetch them from parity-common instead #9083

Merged

dvdplm closed this Jul 10, 2018

5chdn deleted the chore/use-parity-common branch November 27, 2018 11:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use crates from parity-common #9058

Use crates from parity-common #9058

dvdplm commented Jul 6, 2018 •

edited

Loading

niklasad1 Jul 10, 2018

niklasad1 Jul 10, 2018

dvdplm Jul 10, 2018

niklasad1 Jul 10, 2018

debris Jul 10, 2018

dvdplm Jul 10, 2018

niklasad1 Jul 10, 2018

dvdplm Jul 10, 2018

debris Jul 10, 2018

dvdplm Jul 10, 2018 •

edited

Loading

debris Jul 10, 2018

dvdplm Jul 10, 2018

Use crates from parity-common #9058

Use crates from parity-common #9058

Conversation

dvdplm commented Jul 6, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dvdplm Jul 10, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dvdplm commented Jul 6, 2018 •

edited

Loading

dvdplm Jul 10, 2018 •

edited

Loading