From 96d5bdac9680f29ef5077058fccdb709ce42afbd Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 23 Jul 2020 16:12:11 +0200 Subject: [PATCH] Fix integration test (#124) --- cumulus/Cargo.lock | 615 +++++++++--------- cumulus/parachain-upgrade/Cargo.toml | 24 +- cumulus/test/parachain/Cargo.toml | 23 +- cumulus/test/parachain/src/cli.rs | 6 - cumulus/test/parachain/src/command.rs | 37 +- .../test/parachain/src/integration_test.rs | 211 ++++++ cumulus/test/parachain/src/main.rs | 2 + cumulus/test/parachain/src/service.rs | 22 +- .../test/parachain/tests/integration_test.rs | 382 ----------- cumulus/test/runtime/Cargo.toml | 2 +- 10 files changed, 554 insertions(+), 770 deletions(-) create mode 100644 cumulus/test/parachain/src/integration_test.rs delete mode 100644 cumulus/test/parachain/tests/integration_test.rs diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock index fbbef1d717..c0e98545bb 100644 --- a/cumulus/Cargo.lock +++ b/cumulus/Cargo.lock @@ -214,23 +214,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" -[[package]] -name = "async-attributes" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd3d156917d94862e779f356c5acae312b08fd3121e792c857d7928c8088423" -dependencies = [ - "quote 1.0.7", - "syn 1.0.31", -] - [[package]] name = "async-std" version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00d68a33ebc8b57800847d00787307f84a562224a14db069b0acefe4c2abbf5d" dependencies = [ - "async-attributes", "async-task", "crossbeam-utils", "futures-channel", @@ -255,18 +244,6 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17772156ef2829aadc587461c7753af20b7e8db1529bc66855add962a3b35d3" -[[package]] -name = "async-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce6977f57fa68da77ffe5542950d47e9c23d65f5bc7cb0a9f8700996913eec7" -dependencies = [ - "futures 0.3.5", - "rustls 0.16.0", - "webpki", - "webpki-roots 0.17.0", -] - [[package]] name = "async-tls" version = "0.8.0" @@ -321,15 +298,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder", -] - [[package]] name = "base64" version = "0.11.0" @@ -1057,7 +1025,6 @@ version = "0.1.0" dependencies = [ "ansi_term 0.12.1", "assert_cmd", - "async-std", "cumulus-collator", "cumulus-consensus", "cumulus-network", @@ -1065,26 +1032,25 @@ dependencies = [ "cumulus-test-parachain-runtime", "derive_more 0.15.0", "exit-future 0.1.4", - "frame-system", "futures 0.3.5", - "hex", - "jsonrpsee", "log 0.4.8", "nix 0.17.0", - "pallet-grandpa", "pallet-sudo", - "pallet-transaction-payment", "parity-scale-codec", "parking_lot 0.9.0", "polkadot-cli", "polkadot-collator", "polkadot-parachain", "polkadot-primitives", - "polkadot-runtime", "polkadot-runtime-common", "polkadot-service", + "polkadot-test-runtime", + "polkadot-test-runtime-client", + "polkadot-test-service", + "rand 0.7.3", "sc-basic-authorship", "sc-cli", + "sc-client-api", "sc-consensus", "sc-executor", "sc-finality-grandpa", @@ -1092,8 +1058,6 @@ dependencies = [ "sc-network", "sc-service", "sc-transaction-pool", - "serde_json", - "sp-arithmetic", "sp-consensus", "sp-core", "sp-inherents", @@ -1101,11 +1065,11 @@ dependencies = [ "sp-runtime", "sp-timestamp", "sp-transaction-pool", - "sp-version", "structopt", "substrate-build-script-utils", + "substrate-test-client", "substrate-test-runtime-client", - "tempfile", + "tokio 0.2.21", "trie-root 0.15.2", ] @@ -1530,20 +1494,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "flexi_logger" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33897654c23a50cebab45e18356f69fb771c9949a6928344fb1f01ffccc7c5f3" -dependencies = [ - "chrono", - "glob", - "log 0.4.8", - "regex", - "thiserror", - "yansi", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1553,7 +1503,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", ] @@ -1561,7 +1511,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -1578,7 +1528,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "Inflector", "frame-benchmarking", @@ -1597,7 +1547,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -1612,7 +1562,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "serde", @@ -1623,7 +1573,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "bitmask", "frame-metadata", @@ -1648,7 +1598,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1659,7 +1609,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1671,7 +1621,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1681,7 +1631,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1697,7 +1647,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sp-api", @@ -2115,16 +2065,6 @@ dependencies = [ "autocfg 0.1.7", ] -[[package]] -name = "hashbrown" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf" -dependencies = [ - "ahash 0.3.8", - "autocfg 1.0.0", -] - [[package]] name = "hashbrown" version = "0.8.0" @@ -2600,51 +2540,6 @@ dependencies = [ "ws", ] -[[package]] -name = "jsonrpsee" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc8a1da5a54b417cfb7edb9f932024d833dc333de50c21c0e1b28d0e8b4f853" -dependencies = [ - "async-std", - "async-tls 0.6.0", - "bs58", - "bytes 0.5.4", - "fnv", - "futures 0.3.5", - "futures-timer 3.0.2", - "globset", - "hashbrown 0.7.2", - "hyper 0.13.6", - "jsonrpsee-proc-macros", - "lazy_static", - "log 0.4.8", - "parking_lot 0.10.2", - "pin-project", - "rand 0.7.3", - "serde", - "serde_json", - "smallvec 1.4.1", - "soketto 0.3.2", - "thiserror", - "tokio 0.2.21", - "unicase", - "url 2.1.1", - "webpki", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ed1b5f6937dd2c6c79a9ac6e0e3f41bbc64edb5d443840bdc73e606009ed70" -dependencies = [ - "Inflector", - "proc-macro2 1.0.18", - "quote 1.0.7", - "syn 1.0.31", -] - [[package]] name = "keccak" version = "0.1.0" @@ -2664,7 +2559,7 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "bitvec", "frame-executive", @@ -3087,7 +2982,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046a5201f6e471f22b22b394e4d084269ed1e28cf7300f7b49874385db84c7bd" dependencies = [ - "async-tls 0.8.0", + "async-tls", "either", "futures 0.3.5", "libp2p-core", @@ -3095,7 +2990,7 @@ dependencies = [ "quicksink", "rustls 0.18.0", "rw-stream-sink", - "soketto 0.4.1", + "soketto", "url 2.1.1", "webpki", "webpki-roots 0.18.0", @@ -3674,7 +3569,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3690,7 +3585,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3705,7 +3600,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3730,7 +3625,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3744,7 +3639,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3759,7 +3654,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3774,7 +3669,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3788,7 +3683,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3804,7 +3699,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3824,7 +3719,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3840,7 +3735,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3859,7 +3754,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3875,7 +3770,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3889,7 +3784,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3904,7 +3799,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3918,7 +3813,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3933,7 +3828,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3948,7 +3843,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -3961,7 +3856,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "enumflags2", "frame-support", @@ -3976,7 +3871,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3991,7 +3886,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -4011,7 +3906,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -4025,7 +3920,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -4045,7 +3940,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -4056,7 +3951,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -4070,7 +3965,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4087,7 +3982,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -4102,7 +3997,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4120,7 +4015,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "parity-scale-codec", @@ -4133,7 +4028,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -4147,7 +4042,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-support", "frame-system", @@ -4162,7 +4057,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "enumflags2", "frame-support", @@ -4519,7 +4414,7 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" [[package]] name = "polkadot-availability-store" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "derive_more 0.99.7", "exit-future 0.2.0", @@ -4546,7 +4441,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "frame-benchmarking-cli", "futures 0.3.5", @@ -4568,7 +4463,7 @@ dependencies = [ [[package]] name = "polkadot-collator" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "futures 0.3.5", "futures-timer 2.0.2", @@ -4595,7 +4490,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.7.30" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "parity-scale-codec", "sp-core", @@ -4606,7 +4501,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "derive_more 0.15.0", "parity-scale-codec", @@ -4619,7 +4514,7 @@ dependencies = [ [[package]] name = "polkadot-network" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "arrayvec 0.4.12", "bytes 0.5.4", @@ -4647,7 +4542,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -4667,7 +4562,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "bitvec", "frame-system", @@ -4689,7 +4584,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "jsonrpc-core", "pallet-transaction-payment-rpc", @@ -4716,7 +4611,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "bitvec", "frame-executive", @@ -4780,7 +4675,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "bitvec", "frame-support", @@ -4813,7 +4708,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "frame-benchmarking", "frame-system-rpc-runtime-api", @@ -4834,6 +4729,7 @@ dependencies = [ "polkadot-rpc", "polkadot-runtime", "polkadot-validation", + "rococo-runtime", "sc-authority-discovery", "sc-block-builder", "sc-chain-spec", @@ -4872,7 +4768,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -4882,7 +4778,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "bitvec", "frame-executive", @@ -4890,6 +4786,7 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "log 0.3.9", + "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-balances", @@ -4902,6 +4799,7 @@ dependencies = [ "pallet-session", "pallet-staking", "pallet-staking-reward-curve", + "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -4915,11 +4813,13 @@ dependencies = [ "serde_derive", "smallvec 1.4.1", "sp-api", + "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-core", "sp-inherents", "sp-io", + "sp-offchain", "sp-runtime", "sp-session", "sp-staking", @@ -4932,7 +4832,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "futures 0.3.5", "pallet-timestamp", @@ -4940,6 +4840,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "polkadot-test-runtime", + "polkadot-test-service", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -4952,10 +4853,57 @@ dependencies = [ "substrate-test-client", ] +[[package]] +name = "polkadot-test-service" +version = "0.8.2" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" +dependencies = [ + "frame-benchmarking", + "frame-system", + "futures 0.1.29", + "futures 0.3.5", + "hex", + "log 0.4.8", + "pallet-staking", + "pallet-transaction-payment", + "polkadot-availability-store", + "polkadot-network", + "polkadot-primitives", + "polkadot-rpc", + "polkadot-runtime-common", + "polkadot-service", + "polkadot-test-runtime", + "polkadot-validation", + "rand 0.7.3", + "sc-authority-discovery", + "sc-chain-spec", + "sc-client-api", + "sc-consensus", + "sc-consensus-babe", + "sc-executor", + "sc-finality-grandpa", + "sc-informant", + "sc-network", + "sc-service", + "sc-transaction-pool", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-core", + "sp-finality-grandpa", + "sp-inherents", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "substrate-test-client", + "tempfile", +] + [[package]] name = "polkadot-validation" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "ansi_term 0.12.1", "bitvec", @@ -5643,6 +5591,74 @@ dependencies = [ "librocksdb-sys", ] +[[package]] +name = "rococo-runtime" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" +dependencies = [ + "bitvec", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "log 0.3.9", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-balances", + "pallet-collective", + "pallet-democracy", + "pallet-elections-phragmen", + "pallet-finality-tracker", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-multisig", + "pallet-nicks", + "pallet-offences", + "pallet-proxy", + "pallet-randomness-collective-flip", + "pallet-recovery", + "pallet-scheduler", + "pallet-session", + "pallet-society", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "parity-scale-codec", + "polkadot-parachain", + "polkadot-primitives", + "polkadot-runtime-common", + "rustc-hex", + "serde", + "serde_derive", + "smallvec 1.4.1", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-version", + "static_assertions", + "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rpassword" version = "4.0.5" @@ -5698,19 +5714,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustls" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e" -dependencies = [ - "base64 0.10.1", - "log 0.4.8", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.17.0" @@ -5778,7 +5781,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "bytes 0.5.4", "derive_more 0.99.7", @@ -5805,7 +5808,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5829,7 +5832,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5846,7 +5849,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5862,7 +5865,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5873,14 +5876,14 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "ansi_term 0.12.1", "atty", "chrono", "derive_more 0.99.7", + "env_logger", "fdlimit", - "flexi_logger", "futures 0.3.5", "lazy_static", "log 0.4.8", @@ -5914,7 +5917,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "fnv", @@ -5950,7 +5953,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "blake2-rfc", "hash-db", @@ -5979,7 +5982,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5990,7 +5993,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "fork-tree", @@ -6032,7 +6035,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6056,7 +6059,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6069,7 +6072,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6092,7 +6095,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6106,7 +6109,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "lazy_static", @@ -6134,7 +6137,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -6151,7 +6154,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6166,7 +6169,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6187,7 +6190,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "assert_matches", "derive_more 0.99.7", @@ -6225,7 +6228,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "finality-grandpa", @@ -6242,7 +6245,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6260,7 +6263,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "hex", @@ -6276,7 +6279,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "hash-db", "lazy_static", @@ -6295,7 +6298,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "bitflags", "bs58", @@ -6347,7 +6350,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6362,7 +6365,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "bytes 0.5.4", "fnv", @@ -6389,7 +6392,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.3.5", "libp2p", @@ -6402,7 +6405,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6411,7 +6414,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.3.5", "hash-db", @@ -6443,7 +6446,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6467,7 +6470,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6483,7 +6486,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "directories", @@ -6546,7 +6549,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6560,7 +6563,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6581,7 +6584,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "erased-serde", "log 0.4.8", @@ -6598,7 +6601,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6618,7 +6621,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6819,12 +6822,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "sha1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" - [[package]] name = "sha2" version = "0.8.2" @@ -7012,25 +7009,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "soketto" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c9dab3f95c9ebdf3a88268c19af668f637a3c5039c2c56ff2d40b1b2d64a25b" -dependencies = [ - "base64 0.11.0", - "bytes 0.5.4", - "futures 0.3.5", - "http 0.2.1", - "httparse", - "log 0.4.8", - "rand 0.7.3", - "sha1", - "smallvec 1.4.1", - "static_assertions", - "thiserror", -] - [[package]] name = "soketto" version = "0.4.1" @@ -7050,7 +7028,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -7062,7 +7040,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "hash-db", "parity-scale-codec", @@ -7077,7 +7055,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7089,7 +7067,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "serde", @@ -7101,7 +7079,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7114,7 +7092,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sp-api", @@ -7126,7 +7104,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7137,7 +7115,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sp-api", @@ -7149,7 +7127,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -7158,6 +7136,7 @@ dependencies = [ "parking_lot 0.10.2", "sp-block-builder", "sp-consensus", + "sp-database", "sp-runtime", "sp-state-machine", ] @@ -7165,7 +7144,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "serde", "serde_json", @@ -7174,7 +7153,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -7189,6 +7168,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-std", + "sp-trie", "sp-utils", "sp-version", "substrate-prometheus-endpoint", @@ -7198,7 +7178,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sp-api", @@ -7212,7 +7192,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "merlin", "parity-scale-codec", @@ -7231,7 +7211,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7240,7 +7220,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7252,7 +7232,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "base58", "blake2-rfc", @@ -7295,7 +7275,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7304,7 +7284,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7314,7 +7294,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "environmental", "parity-scale-codec", @@ -7325,7 +7305,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7341,7 +7321,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7351,7 +7331,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "parity-scale-codec", @@ -7363,7 +7343,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.3.5", "hash-db", @@ -7384,7 +7364,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "lazy_static", "sp-core", @@ -7395,7 +7375,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "serde", @@ -7407,7 +7387,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7418,7 +7398,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "sp-api", "sp-core", @@ -7428,7 +7408,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "backtrace", "log 0.4.8", @@ -7437,7 +7417,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "serde", "sp-core", @@ -7446,7 +7426,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "either", "hash256-std-hasher", @@ -7468,7 +7448,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7483,7 +7463,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "Inflector", "proc-macro-crate", @@ -7495,7 +7475,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "serde", "serde_json", @@ -7504,7 +7484,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sp-api", @@ -7517,7 +7497,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7527,7 +7507,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7548,12 +7528,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7565,7 +7545,7 @@ dependencies = [ [[package]] name = "sp-test-primitives" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -7578,7 +7558,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7592,7 +7572,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "log 0.4.8", "rental", @@ -7602,7 +7582,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -7618,7 +7598,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "hash-db", "memory-db", @@ -7632,7 +7612,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.3.5", "futures-core", @@ -7644,7 +7624,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7656,7 +7636,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7784,7 +7764,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "platforms", ] @@ -7792,7 +7772,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7815,7 +7795,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "async-std", "derive_more 0.99.7", @@ -7829,7 +7809,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -7855,7 +7835,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "cfg-if", "frame-executive", @@ -7895,7 +7875,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7916,7 +7896,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#b9d96fabd2462cb42862fd0a117ed42bb98401aa" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#093ae510c2e9dda79b88c1f0db4deef4f85b524d" [[package]] name = "substrate-wasm-builder-runner" @@ -8276,6 +8256,7 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "slab", + "tokio-macros", "winapi 0.3.8", ] @@ -8354,6 +8335,17 @@ dependencies = [ "log 0.4.8", ] +[[package]] +name = "tokio-macros" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +dependencies = [ + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", +] + [[package]] name = "tokio-named-pipes" version = "0.1.0" @@ -9017,15 +9009,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.18.0" @@ -9056,7 +9039,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.8.14" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1ae0901d0b879fe80ac4cfc215d3f6edac5af435" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#f5f912ab815352f71484636c7b2dfcf4bbd0c2fe" dependencies = [ "bitvec", "frame-executive", @@ -9226,12 +9209,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "yansi" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71" - [[package]] name = "zeroize" version = "1.1.0" diff --git a/cumulus/parachain-upgrade/Cargo.toml b/cumulus/parachain-upgrade/Cargo.toml index c1f5f9c87a..8bb03980e2 100644 --- a/cumulus/parachain-upgrade/Cargo.toml +++ b/cumulus/parachain-upgrade/Cargo.toml @@ -14,24 +14,24 @@ cumulus-runtime = { path = "../runtime", default-features = false } parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch", default-features = false } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", version = "2.0.0-dev", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", version = "2.0.0-dev", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } # Other Dependencies codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"]} serde = { version = "1.0.101", optional = true, features = ["derive"] } [dev-dependencies] -sp-externalities = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } -substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false } [features] default = ['std'] diff --git a/cumulus/test/parachain/Cargo.toml b/cumulus/test/parachain/Cargo.toml index 5dc82c6c06..f9160fa833 100644 --- a/cumulus/test/parachain/Cargo.toml +++ b/cumulus/test/parachain/Cargo.toml @@ -49,10 +49,11 @@ cumulus-primitives = { path = "../../primitives" } # Polkadot dependencies polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } [build-dependencies] substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } @@ -60,21 +61,17 @@ substrate-build-script-utils = { git = "https://github.com/paritytech/substrate" [dev-dependencies] assert_cmd = "0.12" nix = "0.17" -tempfile = "3.1" -jsonrpsee = "0.1" -async-std = { version = "1.2.0", features = [ "attributes" ] } -hex = "0.4" -serde_json = "1.0" +rand = "0.7.3" +tokio = { version = "0.2.13", features = ["macros"] } # Polkadot dependencies polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } +polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } +polkadot-test-runtime-client = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" } # Substrate dependencies -substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } +substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" } diff --git a/cumulus/test/parachain/src/cli.rs b/cumulus/test/parachain/src/cli.rs index ca34e5c50a..855bc7ff9e 100644 --- a/cumulus/test/parachain/src/cli.rs +++ b/cumulus/test/parachain/src/cli.rs @@ -28,12 +28,6 @@ pub enum Subcommand { /// Export the genesis state of the parachain. #[structopt(name = "export-genesis-state")] ExportGenesisState(ExportGenesisStateCommand), - - /// Run Polkadot for testing purpose - Polkadot(polkadot_cli::Cli), - - #[structopt(name = "validation-worker", setting = structopt::clap::AppSettings::Hidden)] - PolkadotValidationWorker(polkadot_cli::ValidationWorkerCommand), } /// Command for exporting the genesis state of the parachain diff --git a/cumulus/test/parachain/src/command.rs b/cumulus/test/parachain/src/command.rs index d0de87e81c..a2517bc99a 100644 --- a/cumulus/test/parachain/src/command.rs +++ b/cumulus/test/parachain/src/command.rs @@ -115,7 +115,8 @@ impl SubstrateCli for PolkadotCli { } } -fn generate_genesis_state(para_id: ParaId) -> Result { +/// Generate the genesis block +pub fn generate_genesis_state(para_id: ParaId) -> Result { let storage = (&chain_spec::get_chain_spec(para_id)).build_storage()?; let child_roots = storage.children_default.iter().map(|(sk, child_content)| { @@ -156,7 +157,7 @@ pub fn run() -> Result<()> { }) } Some(Subcommand::ExportGenesisState(params)) => { - sc_cli::init_logger("", &::from_args())?; + sc_cli::init_logger(""); let block = generate_genesis_state(params.parachain_id.into())?; let header_hex = format!("0x{:?}", HexDisplay::from(&block.header().encode())); @@ -169,37 +170,6 @@ pub fn run() -> Result<()> { Ok(()) } - Some(Subcommand::Polkadot(polkadot_cli)) => { - let runner = polkadot_cli.create_runner(&polkadot_cli.run.base)?; - let authority_discovery_enabled = polkadot_cli.run.authority_discovery_enabled; - let grandpa_pause = if polkadot_cli.run.grandpa_pause.is_empty() { - None - } else { - Some(( - polkadot_cli.run.grandpa_pause[0], - polkadot_cli.run.grandpa_pause[1], - )) - }; - - runner.run_node_until_exit(|config| match config.role { - Role::Light => polkadot_service::polkadot_new_light(config).map(|r| r.0), - _ => polkadot_service::polkadot_new_full( - config, - None, - None, - authority_discovery_enabled, - 6000, - grandpa_pause, - ) - .map(|(s, _, _)| s), - }) - } - Some(Subcommand::PolkadotValidationWorker(cmd)) => { - sc_cli::init_logger("", &::from_args())?; - polkadot_service::run_validation_worker(&cmd.mem_id)?; - - Ok(()) - } None => { let runner = cli.create_runner(&*cli.run)?; @@ -238,6 +208,7 @@ pub fn run() -> Result<()> { info!("Parachain genesis state: {}", genesis_state); crate::service::run_collator(config, key, polkadot_config, id) + .map(|x| x.task_manager) }) } } diff --git a/cumulus/test/parachain/src/integration_test.rs b/cumulus/test/parachain/src/integration_test.rs new file mode 100644 index 0000000000..1fa47d0de5 --- /dev/null +++ b/cumulus/test/parachain/src/integration_test.rs @@ -0,0 +1,211 @@ +// Copyright 2020 Parity Technologies (UK) Ltd. +// This file is part of Substrate. + +// Substrate is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Substrate is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Substrate. If not, see . + +use codec::Encode; +use futures::{ + future::{self, FutureExt}, + pin_mut, select, +}; +use polkadot_primitives::parachain::{Id as ParaId, Info, Scheduling}; +use polkadot_runtime_common::registrar; +use polkadot_test_runtime_client::Sr25519Keyring; +use sc_client_api::execution_extensions::ExecutionStrategies; +use sc_informant::OutputFormat; +use sc_network::{config::TransportConfig, multiaddr}; +use sc_service::{ + config::{ + DatabaseConfig, KeystoreConfig, MultiaddrWithPeerId, NetworkConfiguration, + WasmExecutionMethod, + }, + BasePath, Configuration, Error as ServiceError, Role, TaskExecutor, +}; +use std::{sync::Arc, time::Duration}; +use substrate_test_client::BlockchainEventsExt; +use substrate_test_runtime_client::AccountKeyring::*; +use tokio::{spawn, time::delay_for as sleep}; + +static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); + +#[tokio::test] +#[ignore] +async fn integration_test() { + let task_executor: TaskExecutor = (|fut, _| { + spawn(fut); + }) + .into(); + + // start alice + let mut alice = + polkadot_test_service::run_test_node(task_executor.clone(), Alice, || {}, vec![]); + + // start bob + let mut bob = polkadot_test_service::run_test_node( + task_executor.clone(), + Bob, + || {}, + vec![alice.addr.clone()], + ); + + let t1 = sleep(Duration::from_secs( + INTEGRATION_TEST_ALLOWED_TIME + .and_then(|x| x.parse().ok()) + .unwrap_or(600), + )) + .fuse(); + + let t2 = async { + let para_id = ParaId::from(100); + + future::join(alice.wait_for_blocks(2), bob.wait_for_blocks(2)).await; + + // export genesis state + let genesis_state = crate::command::generate_genesis_state(para_id) + .unwrap() + .encode(); + + // create and sign transaction + let function = polkadot_test_runtime::Call::Sudo(pallet_sudo::Call::sudo(Box::new( + polkadot_test_runtime::Call::Registrar(registrar::Call::register_para( + para_id, + Info { + scheduling: Scheduling::Always, + }, + parachain_runtime::WASM_BINARY.to_vec().into(), + genesis_state.into(), + )), + ))); + + // register parachain + let _ = alice.call_function(function, Alice).await.unwrap(); + + // run cumulus charlie + let key = Arc::new(sp_core::Pair::from_seed(&[10; 32])); + let mut polkadot_config = polkadot_test_service::node_config( + || {}, + task_executor.clone(), + Charlie, + vec![alice.addr.clone(), bob.addr.clone()], + ); + use std::net::{Ipv4Addr, SocketAddr}; + polkadot_config.rpc_http = Some(SocketAddr::new(Ipv4Addr::LOCALHOST.into(), 27016)); + polkadot_config.rpc_methods = sc_service::config::RpcMethods::Unsafe; + let parachain_config = + parachain_config(task_executor.clone(), Charlie, vec![], para_id).unwrap(); + let service = + crate::service::run_collator(parachain_config, key, polkadot_config, para_id).unwrap(); + sleep(Duration::from_secs(3)).await; + service.client.wait_for_blocks(4).await; + + alice.task_manager.terminate(); + bob.task_manager.terminate(); + } + .fuse(); + + pin_mut!(t1, t2); + + select! { + _ = t1 => { + panic!("the test took too long, maybe no parachain blocks have been produced"); + }, + _ = t2 => {}, + } +} + +pub fn parachain_config( + task_executor: TaskExecutor, + key: Sr25519Keyring, + boot_nodes: Vec, + para_id: ParaId, +) -> Result { + let base_path = BasePath::new_temp_dir()?; + let root = base_path.path().to_path_buf(); + let role = Role::Authority { + sentry_nodes: Vec::new(), + }; + let key_seed = key.to_seed(); + let spec = crate::chain_spec::get_chain_spec(para_id); + + let mut network_config = NetworkConfiguration::new( + format!("Cumulus Test Node for: {}", key_seed), + "network/test/0.1", + Default::default(), + None, + ); + let informant_output_format = OutputFormat { + enable_color: false, + prefix: format!("[{}] ", key_seed), + }; + + network_config.boot_nodes = boot_nodes; + + network_config.allow_non_globals_in_dht = true; + + network_config + .listen_addresses + .push(multiaddr::Protocol::Memory(rand::random()).into()); + + network_config.transport = TransportConfig::MemoryOnly; + + Ok(Configuration { + impl_name: "cumulus-test-node".to_string(), + impl_version: "0.1".to_string(), + role, + task_executor, + transaction_pool: Default::default(), + network: network_config, + keystore: KeystoreConfig::Path { + path: root.join("key"), + password: None, + }, + database: DatabaseConfig::RocksDb { + path: root.join("db"), + cache_size: 128, + }, + state_cache_size: 16777216, + state_cache_child_ratio: None, + pruning: Default::default(), + chain_spec: Box::new(spec), + wasm_method: WasmExecutionMethod::Interpreted, + // NOTE: we enforce the use of the native runtime to make the errors more debuggable + execution_strategies: ExecutionStrategies { + syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible, + importing: sc_client_api::ExecutionStrategy::NativeWhenPossible, + block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible, + offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible, + other: sc_client_api::ExecutionStrategy::NativeWhenPossible, + }, + rpc_http: None, + rpc_ws: None, + rpc_ipc: None, + rpc_ws_max_connections: None, + rpc_cors: None, + rpc_methods: Default::default(), + prometheus_config: None, + telemetry_endpoints: None, + telemetry_external_transport: None, + default_heap_pages: None, + offchain_worker: Default::default(), + force_authoring: false, + disable_grandpa: false, + dev_key_seed: Some(key_seed), + tracing_targets: None, + tracing_receiver: Default::default(), + max_runtime_instances: 8, + announce_block: true, + base_path: Some(base_path), + informant_output_format, + }) +} diff --git a/cumulus/test/parachain/src/main.rs b/cumulus/test/parachain/src/main.rs index be7e27dcd3..d786b6f3cf 100644 --- a/cumulus/test/parachain/src/main.rs +++ b/cumulus/test/parachain/src/main.rs @@ -24,6 +24,8 @@ mod chain_spec; mod service; mod cli; mod command; +#[cfg(test)] +mod integration_test; fn main() -> sc_cli::Result<()> { command::run() diff --git a/cumulus/test/parachain/src/service.rs b/cumulus/test/parachain/src/service.rs index f564e9b56b..682af7d237 100644 --- a/cumulus/test/parachain/src/service.rs +++ b/cumulus/test/parachain/src/service.rs @@ -25,7 +25,7 @@ use sc_finality_grandpa::{ FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider, }; use sc_informant::OutputFormat; -use sc_service::{Configuration, TaskManager}; +use sc_service::{Configuration, ServiceComponents, TFullBackend, TFullClient}; use std::sync::Arc; // Our native executor instance. @@ -55,10 +55,12 @@ macro_rules! new_full_start { client.clone(), builder.prometheus_registry(), )); - let pool = sc_transaction_pool::BasicPool::new( + let pool = sc_transaction_pool::BasicPool::new_full( builder.config().transaction_pool.clone(), pool_api, builder.prometheus_registry(), + builder.spawn_handle(), + client.clone(), ); Ok(pool) })? @@ -86,7 +88,19 @@ pub fn run_collator( key: Arc, mut polkadot_config: polkadot_collator::Configuration, id: polkadot_primitives::parachain::Id, -) -> sc_service::error::Result { +) -> sc_service::error::Result, + sc_consensus::LongestChain, parachain_runtime::opaque::Block>, + sc_transaction_pool::BasicPool< + sc_transaction_pool::FullChainApi< + TFullClient, + parachain_runtime::opaque::Block, + >, + parachain_runtime::opaque::Block, + >, + TFullClient, +>> { let mut parachain_config = prepare_collator_config(parachain_config); parachain_config.informant_output_format = OutputFormat { @@ -152,5 +166,5 @@ pub fn run_collator( .spawn_essential_handle() .spawn("polkadot", polkadot_future); - Ok(service.task_manager) + Ok(service) } diff --git a/cumulus/test/parachain/tests/integration_test.rs b/cumulus/test/parachain/tests/integration_test.rs deleted file mode 100644 index 7172bf18af..0000000000 --- a/cumulus/test/parachain/tests/integration_test.rs +++ /dev/null @@ -1,382 +0,0 @@ -// Copyright 2020 Parity Technologies (UK) Ltd. -// This file is part of Substrate. - -// Substrate is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Substrate is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Substrate. If not, see . - -// TODO: this is necessary for the jsonrpsee macro used -#![allow(unused_variables, dead_code)] - -use assert_cmd::cargo::cargo_bin; -use async_std::{net, task::sleep}; -use codec::Encode; -use futures::{future::FutureExt, join, pin_mut, select}; -use jsonrpsee::{raw::RawClient, transport::http::HttpTransportClient}; -use polkadot_primitives::parachain::{Info, Scheduling}; -use polkadot_primitives::Hash as PHash; -use polkadot_runtime::{Header, Runtime, SignedExtra, SignedPayload}; -use polkadot_runtime_common::{parachains, registrar, BlockHashCount, claims}; -use serde_json::Value; -use sp_arithmetic::traits::SaturatedConversion; -use sp_runtime::generic; -use sp_version::RuntimeVersion; -use std::{ - collections::HashSet, - env, fs, - io::Read, - path::PathBuf, - process::{Child, Command, Stdio}, - time::Duration, -}; -use substrate_test_runtime_client::AccountKeyring::Alice; -use tempfile::tempdir; - -static POLKADOT_ARGS: &[&str] = &["polkadot", "--chain=res/polkadot_chainspec.json"]; -static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME"); - -jsonrpsee::rpc_api! { - Author { - #[rpc(method = "author_submitExtrinsic", positional_params)] - fn submit_extrinsic(extrinsic: String) -> PHash; - } - - Chain { - #[rpc(method = "chain_getFinalizedHead")] - fn current_block_hash() -> PHash; - - #[rpc(method = "chain_getHeader", positional_params)] - fn header(hash: PHash) -> Option
; - - #[rpc(method = "chain_getBlockHash", positional_params)] - fn block_hash(hash: Option) -> Option; - } - - State { - #[rpc(method = "state_getRuntimeVersion")] - fn runtime_version() -> RuntimeVersion; - } - - System { - #[rpc(method = "system_networkState")] - fn network_state() -> Value; - } -} - -// Adapted from -// https://github.com/rust-lang/cargo/blob/485670b3983b52289a2f353d589c57fae2f60f82/tests/testsuite/support/mod.rs#L507 -fn target_dir() -> PathBuf { - env::current_exe() - .ok() - .map(|mut path| { - path.pop(); - if path.ends_with("deps") { - path.pop(); - } - path - }) - .unwrap() -} - -struct ChildHelper<'a> { - name: String, - child: &'a mut Child, -} - -impl<'a> Drop for ChildHelper<'a> { - fn drop(&mut self) { - let name = self.name.clone(); - - self.terminate(); - - let mut stdout = String::new(); - if let Some(reader) = self.child.stdout.as_mut() { - let _ = reader.read_to_string(&mut stdout); - } - eprintln!("process '{}' stdout:\n{}\n", name, stdout,); - - let mut stderr = String::new(); - if let Some(reader) = self.child.stderr.as_mut() { - let _ = reader.read_to_string(&mut stderr); - } - eprintln!("process '{}' stderr:\n{}\n", name, stderr,); - } -} - -impl<'a> ChildHelper<'a> { - fn new(name: &str, child: &'a mut Child) -> ChildHelper<'a> { - ChildHelper { - name: name.to_string(), - child, - } - } - - fn terminate(&mut self) { - match self.child.try_wait() { - Ok(Some(_)) => return, - Ok(None) => {} - Err(err) => { - eprintln!("could not wait for child process to finish: {}", err); - let _ = self.child.kill(); - let _ = self.child.wait(); - return; - } - } - - let _ = self.child.kill(); - - let _ = self.child.wait(); - } -} - -async fn wait_for_tcp(address: A) { - while let Err(err) = net::TcpStream::connect(&address).await { - eprintln!("Waiting for {} to be up ({})...", address, err); - sleep(Duration::from_secs(2)).await; - } -} - -/// wait for parachain blocks to be produced -async fn wait_for_blocks(number_of_blocks: usize, mut client: &mut RawClient) { - let mut previous_blocks = HashSet::with_capacity(number_of_blocks); - - loop { - let current_block_hash = Chain::block_hash(&mut client, None).await.unwrap().unwrap(); - - if previous_blocks.insert(current_block_hash) { - eprintln!("new parachain block: {}", current_block_hash); - - if previous_blocks.len() == number_of_blocks { - break; - } - } - - sleep(Duration::from_secs(2)).await; - } -} - -#[async_std::test] -#[ignore] -#[cfg(feature = "disabled")] -async fn integration_test() { - assert!( - !net::TcpStream::connect("127.0.0.1:27015").await.is_ok(), - "tcp port is already open 127.0.0.1:27015, this test cannot be run", - ); - assert!( - !net::TcpStream::connect("127.0.0.1:27016").await.is_ok(), - "tcp port is already open 127.0.0.1:27016, this test cannot be run", - ); - - let t1 = sleep(Duration::from_secs( - INTEGRATION_TEST_ALLOWED_TIME - .and_then(|x| x.parse().ok()) - .unwrap_or(600), - )) - .fuse(); - let t2 = async { - // start alice - let polkadot_alice_dir = tempdir().unwrap(); - let mut polkadot_alice = Command::new(cargo_bin("cumulus-test-parachain-collator")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .args(POLKADOT_ARGS) - .arg("--base-path") - .arg(polkadot_alice_dir.path()) - .arg("--alice") - .arg("--rpc-methods=unsafe") - .arg("--rpc-port=27015") - .arg("--port=27115") - .spawn() - .unwrap(); - let polkadot_alice_helper = ChildHelper::new("alice", &mut polkadot_alice); - - // start bob - let polkadot_bob_dir = tempdir().unwrap(); - let mut polkadot_bob = Command::new(cargo_bin("cumulus-test-parachain-collator")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .args(POLKADOT_ARGS) - .arg("--base-path") - .arg(polkadot_bob_dir.path()) - .arg("--bob") - .arg("--rpc-methods=unsafe") - .arg("--rpc-port=27016") - .arg("--port=27116") - .spawn() - .unwrap(); - let polkadot_bob_helper = ChildHelper::new("bob", &mut polkadot_bob); - - // wait for both nodes to be up and running - join!( - wait_for_tcp("127.0.0.1:27015"), - wait_for_tcp("127.0.0.1:27016") - ); - - // export genesis state - let cmd = Command::new(cargo_bin("cumulus-test-parachain-collator")) - .arg("export-genesis-state") - .output() - .unwrap(); - assert!(cmd.status.success()); - let output = &cmd.stdout; - let genesis_state = hex::decode(&output[2..output.len() - 1]).unwrap(); - - // connect RPC clients - let transport_client_alice = - jsonrpsee::transport::http::HttpTransportClient::new("http://127.0.0.1:27015"); - let mut client_alice = jsonrpsee::raw::RawClient::new(transport_client_alice); - let transport_client_bob = - jsonrpsee::transport::http::HttpTransportClient::new("http://127.0.0.1:27016"); - let mut client_bob = jsonrpsee::raw::RawClient::new(transport_client_bob); - - // retrieve nodes network id - let polkadot_alice_id = System::network_state(&mut client_alice).await.unwrap()["peerId"] - .as_str() - .unwrap() - .to_string(); - let polkadot_bob_id = System::network_state(&mut client_bob).await.unwrap()["peerId"] - .as_str() - .unwrap() - .to_string(); - - // retrieve runtime version - let runtime_version = State::runtime_version(&mut client_alice).await.unwrap(); - - // get the current block - let current_block_hash = Chain::block_hash(&mut client_alice, None) - .await - .unwrap() - .unwrap(); - let current_block = Chain::header(&mut client_alice, current_block_hash) - .await - .unwrap() - .unwrap() - .number - .saturated_into::(); - - let genesis_block = Chain::block_hash(&mut client_alice, 0) - .await - .unwrap() - .unwrap(); - - // create and sign transaction - let wasm = fs::read(target_dir().join( - "wbuild/cumulus-test-parachain-runtime/cumulus_test_parachain_runtime.compact.wasm", - )) - .unwrap(); - let call = pallet_sudo::Call::sudo(Box::new( - registrar::Call::::register_para( - 100.into(), - Info { - scheduling: Scheduling::Always, - }, - wasm.into(), - genesis_state.into(), - ) - .into(), - )); - let nonce = 0; - let period = BlockHashCount::get() - .checked_next_power_of_two() - .map(|c| c / 2) - .unwrap_or(2) as u64; - let tip = 0; - let extra: SignedExtra = ( - frame_system::CheckSpecVersion::::new(), - frame_system::CheckTxVersion::::new(), - frame_system::CheckGenesis::::new(), - frame_system::CheckEra::::from(generic::Era::mortal(period, current_block)), - frame_system::CheckNonce::::from(nonce), - frame_system::CheckWeight::::new(), - pallet_transaction_payment::ChargeTransactionPayment::::from(tip), - registrar::LimitParathreadCommits::::new(), - parachains::ValidateDoubleVoteReports::::new(), - pallet_grandpa::ValidateEquivocationReport::::new(), - claims::PrevalidateAttests::::new(), - ); - let raw_payload = SignedPayload::from_raw( - call.clone().into(), - extra.clone(), - ( - (), - runtime_version.spec_version, - runtime_version.transaction_version, - genesis_block, - current_block_hash, - (), - (), - (), - (), - (), - (), - (), - ), - ); - let signature = raw_payload.using_encoded(|e| Alice.sign(e)); - - // register parachain - let ex = polkadot_runtime::UncheckedExtrinsic::new_signed( - call.into(), - Alice.into(), - sp_runtime::MultiSignature::Sr25519(signature), - extra, - ); - let _register_block_hash = - Author::submit_extrinsic(&mut client_alice, format!("0x{}", hex::encode(ex.encode()))) - .await - .unwrap(); - - // run cumulus charlie - let cumulus_charlie_dir = tempdir().unwrap(); - let mut cumulus_charlie = Command::new(cargo_bin("cumulus-test-parachain-collator")) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .arg("--base-path") - .arg(cumulus_charlie_dir.path()) - .arg("--rpc-methods=unsafe") - .arg("--rpc-port=27017") - .arg("--port=27117") - .arg("--") - .arg(format!( - "--bootnodes=/ip4/127.0.0.1/tcp/27115/p2p/{}", - polkadot_alice_id - )) - .arg(format!( - "--bootnodes=/ip4/127.0.0.1/tcp/27116/p2p/{}", - polkadot_bob_id - )) - .arg("--charlie") - .spawn() - .unwrap(); - let cumulus_charlie_helper = ChildHelper::new("cumulus-charlie", &mut cumulus_charlie); - wait_for_tcp("127.0.0.1:27017").await; - - // connect rpc client to cumulus - let transport_client_cumulus_charlie = - jsonrpsee::transport::http::HttpTransportClient::new("http://127.0.0.1:27017"); - let mut client_cumulus_charlie = - jsonrpsee::raw::RawClient::new(transport_client_cumulus_charlie); - - wait_for_blocks(4, &mut client_cumulus_charlie).await; - } - .fuse(); - - pin_mut!(t1, t2); - - select! { - _ = t1 => { - panic!("the test took too long, maybe no parachain blocks have been produced"); - }, - _ = t2 => {}, - } -} diff --git a/cumulus/test/runtime/Cargo.toml b/cumulus/test/runtime/Cargo.toml index a5629ae2ae..133525ed56 100644 --- a/cumulus/test/runtime/Cargo.toml +++ b/cumulus/test/runtime/Cargo.toml @@ -7,7 +7,7 @@ build = "build.rs" [dependencies] runtime = { package = "cumulus-runtime", path = "../../runtime", default-features = false } -substrate-test-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "cumulus-branch" } +substrate-test-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "cumulus-branch", version = "2.0.0-rc4" } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = " 1.0.6" }