diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 7e77f3003b..eb7a89e78c 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -4390,7 +4390,7 @@ dependencies = [ name = "substrate-consensus-common-primitives" version = "2.0.0" dependencies = [ - "parity-codec 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 4.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0", "sr-std 2.0.0", "substrate-client 2.0.0", diff --git a/substrate/core/consensus/common/primitives/Cargo.toml b/substrate/core/consensus/common/primitives/Cargo.toml index 154863eed5..df44db2f34 100644 --- a/substrate/core/consensus/common/primitives/Cargo.toml +++ b/substrate/core/consensus/common/primitives/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] parity-codec = { version = "4.1.1", default-features = false } client = { package = "substrate-client", path = "../../../client", default-features = false } -sr-primitives = { package = "sr-primitives", path = "../../../sr-primitives", default-features = false } +sr-primitives = { path = "../../../sr-primitives", default-features = false } rstd = { package = "sr-std", path = "../../../sr-std", default-features = false } [features] diff --git a/substrate/core/network/src/custom_proto/behaviour.rs b/substrate/core/network/src/custom_proto/behaviour.rs index babd93f932..1cfa16ea6b 100644 --- a/substrate/core/network/src/custom_proto/behaviour.rs +++ b/substrate/core/network/src/custom_proto/behaviour.rs @@ -24,7 +24,7 @@ use futures03::{compat::Compat, TryFutureExt as _, StreamExt as _, TryStreamExt use libp2p::core::{ConnectedPoint, Multiaddr, PeerId}; use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters}; use log::{debug, error, trace, warn}; -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::traits::Block as BlockT; use smallvec::SmallVec; use std::{borrow::Cow, collections::hash_map::Entry, cmp, error, marker::PhantomData, mem, pin::Pin}; use std::time::{Duration, Instant}; diff --git a/substrate/core/network/src/custom_proto/handler.rs b/substrate/core/network/src/custom_proto/handler.rs index 6904d18c4b..5cdedf4940 100644 --- a/substrate/core/network/src/custom_proto/handler.rs +++ b/substrate/core/network/src/custom_proto/handler.rs @@ -29,7 +29,7 @@ use libp2p::swarm::{ SubstreamProtocol, }; use log::{debug, error}; -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::traits::Block as BlockT; use smallvec::{smallvec, SmallVec}; use std::{borrow::Cow, error, fmt, io, marker::PhantomData, mem, time::Duration}; use tokio_io::{AsyncRead, AsyncWrite}; diff --git a/substrate/core/network/src/custom_proto/upgrade.rs b/substrate/core/network/src/custom_proto/upgrade.rs index c01de89cdd..1959ca2883 100644 --- a/substrate/core/network/src/custom_proto/upgrade.rs +++ b/substrate/core/network/src/custom_proto/upgrade.rs @@ -23,7 +23,7 @@ use log::warn; use std::{collections::VecDeque, io, marker::PhantomData, vec::IntoIter as VecIntoIter}; use futures::{prelude::*, future, stream}; use parity_codec::{Decode, Encode}; -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::traits::Block as BlockT; use tokio_io::{AsyncRead, AsyncWrite}; use unsigned_varint::codec::UviBytes;