Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ring to 0.13 #674

Merged
merged 4 commits into from
Jan 10, 2019
Merged

Update ring to 0.13 #674

merged 4 commits into from
Jan 10, 2019

Conversation

twittner
Copy link
Contributor

No description provided.

@ghost ghost assigned twittner Nov 22, 2018
@ghost ghost added the in progress label Nov 22, 2018
@tomaka
Copy link
Member

tomaka commented Nov 22, 2018

Substrate uses ring 0.12 as far as I know, and two versions of ring can't be part of the same project simultaneously because of conflicts in symbols.

@twittner
Copy link
Contributor Author

Substrate could just update to ring 0.13 once we have. Itsparity-crypto dependency depends on ring 0.13 (as of version 0.2) and substrate-primitives could likewise upgrade. Without its dependencies updating, substrate can not move forward though.

@tomaka
Copy link
Member

tomaka commented Nov 22, 2018

Agree. However I would do that in two steps: first update Substrate with the latest changes in libp2p, then only switch to ring 0.13.

@ghost ghost assigned tomaka Jan 10, 2019
@tomaka tomaka merged commit f55a8bc into libp2p:master Jan 10, 2019
@ghost ghost removed the in progress label Jan 10, 2019
@twittner twittner deleted the update-ring branch January 10, 2019 10:26
tomaka pushed a commit to tomaka/libp2p-rs that referenced this pull request Jan 10, 2019
dvdplm added a commit to dvdplm/rust-libp2p that referenced this pull request Jan 15, 2019
* upstream/master: (35 commits)
  Bump libp2p-secio and libp2p-core-derive (libp2p#857)
  Fixes to Kademlia queries (libp2p#855)
  Cache the secp256k1 object in secio (libp2p#856)
  Fix custom derive when using a where clause (libp2p#853)
  Bump to 0.2.2 (libp2p#852)
  Bump to v0.2.1 (libp2p#851)
  Add IntoNodeHandler and IntoProtocolsHandler traits (libp2p#848)
  Improve doc aesthetics (libp2p#850)
  Fix compilation of ring (libp2p#846)
  Add some benchmarks for secio (libp2p#847)
  Version 0.2 (libp2p#841)
  Forbid dialing self (libp2p#839)
  Add an Error associated type to transports (libp2p#835)
  Update ring to 0.13 (libp2p#674)
  Move tests to separate files (libp2p#827)
  multistream-select: Less allocations. (libp2p#800)
  Add more methods on Topology (libp2p#826)
  Documentation improve to ping and minor improvements (libp2p#831)
  Floodsub now produces FloodsubEvent (libp2p#823)
  Add RawSwarm::incoming_negotiated (libp2p#821)
  ...
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.

None yet

2 participants