Skip to content

change dependencies of keccak-hashand trie-standardmap#111

Merged
ordian merged 3 commits into
paritytech:masterfrom
koushiro:fix/keccak-hash-dep
Apr 2, 2019
Merged

change dependencies of keccak-hashand trie-standardmap#111
ordian merged 3 commits into
paritytech:masterfrom
koushiro:fix/keccak-hash-dep

Conversation

@koushiro
Copy link
Copy Markdown
Contributor

Change ethereum-types dep to primitive-types dep of keccak-hash.
Remove the ethereum-types dep of trie-standardmap.

Need to process the #110 firstly.

@parity-cla-bot
Copy link
Copy Markdown

It looks like @koushiro signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

Comment thread fixed-hash/src/hash.rs
#[repr(C)]
$(#[$attr])*
$visibility struct $name ([u8; $n_bytes]);
$visibility struct $name (pub [u8; $n_bytes]);
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this line is already part of the other PR, isn't it?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it is.

@koushiro
Copy link
Copy Markdown
Contributor Author

@Robbepop #110 has been merged, PTAL this PR again.

Copy link
Copy Markdown
Contributor

@dvdplm dvdplm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@dvdplm
Copy link
Copy Markdown
Contributor

dvdplm commented Apr 2, 2019

@koushiro seems like the triehash tests hang on windows for some reason. Any idea what is going on there?

@koushiro
Copy link
Copy Markdown
Contributor Author

koushiro commented Apr 2, 2019

@koushiro seems like the triehash tests hang on windows for some reason. Any idea what is going on there?

#118

@ordian
Copy link
Copy Markdown
Contributor

ordian commented Apr 2, 2019

a rebase on master should help

koushiro added 3 commits April 2, 2019 17:28
Signed-off-by: koushiro <koushiro.cqx@gmail.com>
This reverts commit 529720d.

Signed-off-by: koushiro <koushiro.cqx@gmail.com>
Signed-off-by: koushiro <koushiro.cqx@gmail.com>
@koushiro
Copy link
Copy Markdown
Contributor Author

koushiro commented Apr 2, 2019

@dvdplm @ordian PTAL again.

@ordian ordian merged commit 1409dda into paritytech:master Apr 2, 2019
ordian added a commit that referenced this pull request Apr 4, 2019
* master:
  change dependencies of `keccak-hash`and `trie-standardmap` (#111)
  bring appveyor back (#118)
  Extract `should_replace` from Scoring and supply pooled txs from same sender (#116)
ordian added a commit that referenced this pull request May 6, 2019
* master:
  Bump fixed-hash to 0.3.2 (#134)
  Use EntropyRng instead of OsRng (#130)
  Bump parity-crypto to 0.3.1 (#132)
  rust-crypto dependency removal (#85)
  Use newly stablized TryFrom trait for primitive-types (#127)
  change dependencies of `keccak-hash`and `trie-standardmap` (#111)
  bring appveyor back (#118)
  Extract `should_replace` from Scoring and supply pooled txs from same sender (#116)
@koushiro koushiro deleted the fix/keccak-hash-dep branch May 27, 2019 02:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants