Skip to content

Commit 04255f1

Browse files
gavofyorkrphmeier
gavofyork
authored and
rphmeier
committed
Substrate.from() (paritytech#431)
* Update branches * Bump runtime. * Update again.
1 parent e4cbfac commit 04255f1

File tree

15 files changed

+674
-644
lines changed

15 files changed

+674
-644
lines changed

‎Cargo.lock‎

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

‎availability-store/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ polkadot-primitives = { path = "../primitives" }
1010
parking_lot = "0.9.0"
1111
log = "0.4.6"
1212
codec = { package = "parity-scale-codec", version = "~1.0.0", default-features = false, features = ["derive"] }
13-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
13+
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1414
kvdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
1515
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
1616
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }

‎cli/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ tokio = "0.1.7"
1111
futures = "0.1.17"
1212
exit-future = "0.1"
1313
structopt = "0.2"
14-
cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
14+
cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1515
service = { package = "polkadot-service", path = "../service" }

‎collator/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ edition = "2018"
88
[dependencies]
99
futures = "0.1.17"
1010
futures03 = { package = "futures-preview", version = "0.3.0-alpha.17", features = ["compat"] }
11-
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
12-
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
13-
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
14-
consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
11+
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
12+
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
13+
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
14+
consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1515
polkadot-runtime = { path = "../runtime" }
1616
polkadot-primitives = { path = "../primitives" }
1717
polkadot-cli = { path = "../cli" }
@@ -22,4 +22,4 @@ log = "0.4"
2222
tokio = "0.1.7"
2323

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

‎erasure-coding/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ edition = "2018"
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.0.0", default-features = false, features = ["derive"] }
11-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
12-
trie = { package = "substrate-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
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" }

‎executor/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ description = "Polkadot node implementation in Rust."
66
edition = "2018"
77

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

‎network/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ av_store = { package = "polkadot-availability-store", path = "../availability-st
1212
polkadot-validation = { path = "../validation" }
1313
polkadot-primitives = { path = "../primitives" }
1414
codec = { package = "parity-scale-codec", version = "~1.0.0", default-features = false, features = ["derive"] }
15-
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
16-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
17-
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
15+
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
16+
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
17+
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1818
futures = "0.1"
1919
log = "0.4"
2020
exit-future = "0.1.4"
21-
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
21+
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
2222

2323
[dev-dependencies]
24-
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
24+
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }

‎parachain/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.0.5", default-features =
1010
wasmi = { version = "0.4.3", optional = true }
1111
derive_more = { version = "0.14", optional = true }
1212
serde = { version = "1.0", default-features = false, features = [ "derive" ] }
13-
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-testing", default-features = false }
13+
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
1414
lazy_static = { version = "1.3.0", optional = true }
1515
parking_lot = { version = "0.7.1", optional = true }
1616
log = { version = "0.4.6", optional = true }

‎primitives/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ edition = "2018"
77
[dependencies]
88
serde = { version = "1.0", optional = true, features = ["derive"] }
99
parity-scale-codec = { version = "1.0.5", default-features = false, features = ["bit-vec", "derive"] }
10-
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
11-
application-crypto = { package = "substrate-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
12-
substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
13-
sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
14-
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
15-
runtime_primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
10+
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
11+
application-crypto = { package = "substrate-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
12+
substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
13+
sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
14+
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
15+
runtime_primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
1616
polkadot-parachain = { path = "../parachain", default-features = false }
1717
bitvec = { version = "0.14.0", default-features = false, features = ["alloc"] }
18-
babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
18+
babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
1919

2020
[dev-dependencies]
21-
substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
21+
substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
2222
pretty_assertions = "0.5.1"
2323

2424
[features]

‎runtime/Cargo.toml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,48 +14,48 @@ safe-mix = { version = "1.0", default-features = false}
1414
serde = { version = "1.0", default-features = false }
1515
serde_derive = { version = "1.0", optional = true }
1616

17-
babe-primitives = { package = "substrate-consensus-babe-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
18-
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
19-
inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
20-
offchain-primitives = { package = "substrate-offchain-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
21-
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
22-
sr-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
23-
sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
24-
sr-staking-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
25-
substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
26-
substrate-serializer = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
27-
substrate-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
28-
version = { package = "sr-version", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
17+
babe-primitives = { package = "substrate-consensus-babe-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
18+
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
19+
inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
20+
offchain-primitives = { package = "substrate-offchain-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
21+
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
22+
sr-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
23+
sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
24+
sr-staking-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
25+
substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
26+
substrate-serializer = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
27+
substrate-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
28+
version = { package = "sr-version", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
2929

30-
authorship = { package = "srml-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
31-
babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
32-
balances = { package = "srml-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
33-
collective = { package = "srml-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
34-
democracy = { package = "srml-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
35-
elections = { package = "srml-elections", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
36-
executive = { package = "srml-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
37-
finality-tracker = { package = "srml-finality-tracker", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
38-
grandpa = { package = "srml-grandpa", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
39-
im-online = { package = "srml-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
40-
indices = { package = "srml-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
41-
membership = { package = "srml-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
42-
offences = { package = "srml-offences", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
43-
session = { package = "srml-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
44-
srml-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
45-
staking = { package = "srml-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
46-
sudo = { package = "srml-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
47-
system = { package = "srml-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
48-
timestamp = { package = "srml-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
49-
treasury = { package = "srml-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-testing" }
30+
authorship = { package = "srml-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
31+
babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
32+
balances = { package = "srml-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
33+
collective = { package = "srml-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
34+
democracy = { package = "srml-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
35+
elections = { package = "srml-elections", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
36+
executive = { package = "srml-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
37+
finality-tracker = { package = "srml-finality-tracker", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
38+
grandpa = { package = "srml-grandpa", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
39+
im-online = { package = "srml-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
40+
indices = { package = "srml-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
41+
membership = { package = "srml-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
42+
offences = { package = "srml-offences", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
43+
session = { package = "srml-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
44+
srml-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
45+
staking = { package = "srml-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
46+
sudo = { package = "srml-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
47+
system = { package = "srml-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
48+
timestamp = { package = "srml-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
49+
treasury = { package = "srml-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
5050

5151
primitives = { package = "polkadot-primitives", path = "../primitives", default-features = false }
5252

5353
[dev-dependencies]
5454
hex-literal = "0.2.0"
5555
libsecp256k1 = "0.2.1"
5656
tiny-keccak = "1.4.2"
57-
keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
58-
substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-testing" }
57+
keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
58+
substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
5959
trie-db = "0.15"
6060
serde_json = "1.0"
6161

0 commit comments

Comments
 (0)