Skip to content

Commit abb5111

Browse files
gnunicorngavofyork
gnunicorn
authored and
gavofyork
committed
fix for latest substrate crate renaming (paritytech#641)
* rename crates as appropriate * Rename to use master - easy to revert, but shows it's working * Bump runtime version * Bump version * Bump Substrate again
1 parent f7d4826 commit abb5111

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1760
-1760
lines changed

‎Cargo.lock‎

Lines changed: 1513 additions & 1513 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ path = "src/main.rs"
44

55
[package]
66
name = "polkadot"
7-
version = "0.7.1"
7+
version = "0.7.2"
88
authors = ["Parity Technologies <[email protected]>"]
99
build = "build.rs"
1010
edition = "2018"

‎availability-store/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "polkadot-availability-store"
33
description = "Persistent database for parachain data"
4-
version = "0.7.1"
4+
version = "0.7.2"
55
authors = ["Parity Technologies <[email protected]>"]
66
edition = "2018"
77

@@ -10,7 +10,7 @@ polkadot-primitives = { path = "../primitives" }
1010
parking_lot = "0.9.0"
1111
log = "0.4.8"
1212
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
13-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
13+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
1414
kvdb = "0.1.1"
1515
kvdb-memorydb = "0.1.2"
1616

‎cli/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-cli"
3-
version = "0.7.1"
3+
version = "0.7.2"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Polkadot node implementation in Rust."
66
edition = "2018"
@@ -11,7 +11,7 @@ tokio = "0.1.22"
1111
futures = { version = "0.3.1", features = ["compat"] }
1212
futures01 = { package = "futures", version = "0.1.29" }
1313
structopt = "0.3.4"
14-
cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
14+
cli = { package = "sc-cli", git = "https://github.com/paritytech/substrate", branch = "master" }
1515
service = { package = "polkadot-service", path = "../service" }
1616

1717
[features]

‎collator/Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[package]
22
name = "polkadot-collator"
3-
version = "0.7.1"
3+
version = "0.7.2"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Collator node implementation"
66
edition = "2018"
77

88
[dependencies]
99
futures01 = { package = "futures", version = "0.1.17" }
1010
futures = { version = "0.3.1", features = ["compat"] }
11-
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
12-
client-api = { package = "substrate-client-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
13-
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
14-
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
15-
consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
11+
client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "master" }
12+
client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
13+
primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
14+
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
15+
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
1616
polkadot-runtime = { path = "../runtime" }
1717
polkadot-primitives = { path = "../primitives" }
1818
polkadot-cli = { path = "../cli" }
@@ -24,4 +24,4 @@ tokio = "0.1.22"
2424
futures-timer = "1.0"
2525

2626
[dev-dependencies]
27-
keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
27+
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }

‎collator/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pub use polkadot_cli::{VersionInfo, TaskExecutor};
7474
pub use polkadot_network::validation::Incoming;
7575
pub use polkadot_validation::SignedStatement;
7676
pub use polkadot_primitives::parachain::CollatorId;
77-
pub use substrate_network::PeerId;
77+
pub use sc_network::PeerId;
7878

7979
const COLLATION_TIMEOUT: Duration = Duration::from_secs(30);
8080

‎erasure-coding/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[package]
22
name = "polkadot-erasure-coding"
3-
version = "0.7.1"
3+
version = "0.7.2"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

77
[dependencies]
88
primitives = { package = "polkadot-primitives", path = "../primitives" }
99
reed_solomon = { package = "reed-solomon-erasure", git = "https://github.com/paritytech/reed-solomon-erasure" }
1010
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
11-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
12-
trie = { package = "substrate-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
11+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
12+
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }

‎erasure-coding/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use codec::{Encode, Decode};
2828
use reed_solomon::galois_16::{self, ReedSolomon};
2929
use primitives::{Hash as H256, BlakeTwo256, HashT};
3030
use primitives::parachain::{BlockData, OutgoingMessages};
31-
use substrate_primitives::Blake2Hasher;
31+
use sp_core::Blake2Hasher;
3232
use trie::{EMPTY_PREFIX, MemoryDB, Trie, TrieMut, trie_types::{TrieDBMut, TrieDB}};
3333

3434
use self::wrapped_shard::WrappedShard;

‎executor/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[package]
22
name = "polkadot-executor"
3-
version = "0.7.1"
3+
version = "0.7.2"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Polkadot node implementation in Rust."
66
edition = "2018"
77

88
[dependencies]
9-
substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
9+
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
1010
polkadot-runtime = { path = "../runtime" }

‎executor/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! A `CodeExecutor` specialisation which uses natively compiled runtime when the wasm to be
1818
//! executed is equivalent to the natively compiled code.
1919
20-
use substrate_executor::native_executor_instance;
20+
use sc_executor::native_executor_instance;
2121

2222
native_executor_instance!(
2323
pub Executor,

0 commit comments

Comments
 (0)