Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Remove ethereum-types as direct dependency #812

Merged
merged 1 commit into from
Sep 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/network-libp2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ error-chain = { version = "0.12", default-features = false }
fnv = "1.0"
futures = "0.1"
libp2p = { git = "https://github.com/tomaka/libp2p-rs", rev = "8111062f0177fd7423626f2db9560273644a4c4d", default-features = false, features = ["libp2p-secio", "libp2p-secio-secp256k1"] }
ethereum-types = "0.3"
parking_lot = "0.5"
libc = "0.2"
log = "0.3"
Expand All @@ -26,6 +25,7 @@ tokio-executor = "0.1"
tokio-io = "0.1"
tokio-timer = "0.2"
unsigned-varint = { version = "0.2.1", features = ["codec"] }
substrate-primitives = { path = "../primitives" }

[dev-dependencies]
assert_matches = "1.2"
Expand Down
3 changes: 1 addition & 2 deletions core/network-libp2p/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@ extern crate serde;
#[macro_use]
extern crate serde_derive;
extern crate serde_json;
extern crate substrate_primitives as primitives;
extern crate smallvec;
extern crate bytes;
extern crate unsigned_varint;

extern crate ethereum_types;

#[macro_use]
extern crate error_chain;
#[macro_use]
Expand Down
2 changes: 1 addition & 1 deletion core/network-libp2p/src/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use std::time::Duration;
use TimerToken;
use libp2p::{multiaddr::Protocol, Multiaddr};
use error::Error;
use ethereum_types::H512;
use primitives::hash::H512;

/// Protocol handler level packet id
pub type PacketId = u8;
Expand Down