From bca23892943a30727b7b36853fbc78a442b75d58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 15:29:47 +0000 Subject: [PATCH 1/5] submodule: bump test/hosts/substrate from `6aa73f2` to `e6fcc2a` Bumps [test/hosts/substrate](https://github.com/paritytech/polkadot) from `6aa73f2` to `e6fcc2a`. - [Release notes](https://github.com/paritytech/polkadot/releases) - [Commits](https://github.com/paritytech/polkadot/compare/6aa73f266398fdc4afbc1c0e965eeae053accbc7...e6fcc2a99dddd23b45231a2dbc6eeecd480663af) Signed-off-by: dependabot[bot] --- test/hosts/substrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hosts/substrate b/test/hosts/substrate index 6aa73f266..e6fcc2a99 160000 --- a/test/hosts/substrate +++ b/test/hosts/substrate @@ -1 +1 @@ -Subproject commit 6aa73f266398fdc4afbc1c0e965eeae053accbc7 +Subproject commit e6fcc2a99dddd23b45231a2dbc6eeecd480663af From 2026d55df0d301e4dc793a983a8c0d15d68f61b4 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Mon, 15 Mar 2021 16:33:43 +0100 Subject: [PATCH 2/5] substrate-adapter: 6aa73f2 -> e6fcc2a --- test/adapters/substrate/Cargo.lock | 169 +++++++++++++++-------------- test/adapters/substrate/Cargo.toml | 2 +- 2 files changed, 91 insertions(+), 80 deletions(-) diff --git a/test/adapters/substrate/Cargo.lock b/test/adapters/substrate/Cargo.lock index 63c8390d7..eb3c45e40 100644 --- a/test/adapters/substrate/Cargo.lock +++ b/test/adapters/substrate/Cargo.lock @@ -282,9 +282,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.58" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" dependencies = [ "jobserver", ] @@ -1068,7 +1068,7 @@ dependencies = [ name = "hostapi-runtime" version = "3.0.0" dependencies = [ - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "sp-core 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-wasm-builder", ] @@ -1097,7 +1097,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed" dependencies = [ - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", ] [[package]] @@ -1255,11 +1255,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -1504,14 +1504,14 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "2.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd3dab59b5cf4bc81069ade0fc470341a1ef3ad5fa73e5a8943bed2ec12b2e8" +checksum = "75c823fdae1bb5ff5708ee61a62697e6296175dc671710876871c853f48592b3" dependencies = [ "arrayvec 0.5.2", "bitvec 0.20.1", "byte-slice-cast 1.0.0", - "parity-scale-codec-derive 2.0.1", + "parity-scale-codec-derive 2.0.0", "serde", ] @@ -1521,7 +1521,7 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41512944b1faff334a5f1b9447611bf4ef40638ccb6328173dacefb338e878c" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -1529,11 +1529,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa04976a81fde04924b40cc4036c4d12841e8bb04325a5cf2ada75731a150a7d" +checksum = "9029e65297c7fd6d7013f0579e193ec2b34ae78eabca854c9417504ad8a2d214" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -1761,6 +1761,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -2120,13 +2130,13 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", "lazy_static", "libsecp256k1", "log", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "parity-wasm 0.41.0", "parking_lot 0.11.1", "sc-executor-common", @@ -2149,10 +2159,10 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "parity-wasm 0.41.0", "sp-allocator", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate)", @@ -2165,10 +2175,10 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "sc-executor-common", "sp-allocator", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate)", @@ -2180,10 +2190,10 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "parity-wasm 0.41.0", "pwasm-utils", "sc-executor-common", @@ -2410,7 +2420,7 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate)", @@ -2422,10 +2432,11 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "hash-db", - "parity-scale-codec 2.0.1", + "log", + "parity-scale-codec 2.0.0", "sp-api-proc-macro", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate)", "sp-runtime", @@ -2438,10 +2449,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "blake2-rfc", - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -2450,9 +2461,9 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "serde", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate)", "sp-io", @@ -2462,11 +2473,11 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "serde", "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate)", "sp-std 3.0.0 (git+https://github.com/paritytech/substrate)", @@ -2493,7 +2504,7 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "parity-util-mem 0.9.0", "parking_lot 0.11.1", "primitive-types 0.9.0", @@ -2520,7 +2531,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "base58", "blake2-rfc", @@ -2537,7 +2548,7 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "parity-util-mem 0.9.0", "parking_lot 0.11.1", "primitive-types 0.9.0", @@ -2575,7 +2586,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "proc-macro2", "quote", @@ -2589,7 +2600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fdc625f8c7b13b9a136d334888b21b5743d2081cb666cb03efca1dc9b8f74d1" dependencies = [ "environmental", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "sp-std 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-storage 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2597,10 +2608,10 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "environmental", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "sp-std 3.0.0 (git+https://github.com/paritytech/substrate)", "sp-storage 3.0.0 (git+https://github.com/paritytech/substrate)", ] @@ -2608,13 +2619,13 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures", "hash-db", "libsecp256k1", "log", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "parking_lot 0.11.1", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate)", "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate)", @@ -2632,13 +2643,13 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "async-trait", "derive_more", "futures", "merlin", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "parking_lot 0.11.1", "schnorrkel", "serde", @@ -2649,7 +2660,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "backtrace", ] @@ -2657,13 +2668,13 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "either", "hash256-std-hasher 0.15.2", "impl-trait-for-tuples 0.2.1", "log", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "parity-util-mem 0.9.0", "paste", "rand 0.7.3", @@ -2682,7 +2693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2e5c88b4bc8d607e4e2ff767a85db58cf7101f3dd6064f06929342ea67fe8fb" dependencies = [ "impl-trait-for-tuples 0.2.1", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "primitive-types 0.9.0", "sp-externalities 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-runtime-interface-proc-macro 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2696,10 +2707,10 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "impl-trait-for-tuples 0.2.1", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "primitive-types 0.9.0", "sp-externalities 0.9.0 (git+https://github.com/paritytech/substrate)", "sp-runtime-interface-proc-macro 3.0.0 (git+https://github.com/paritytech/substrate)", @@ -2717,7 +2728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19a6c7c2251512c9e533d15db8a863b06ece1cbee778130dd9adbe44b6b39aa9" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -2726,10 +2737,10 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -2738,7 +2749,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "serde", "serde_json", @@ -2747,12 +2758,12 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "parking_lot 0.11.1", "rand 0.7.3", "smallvec", @@ -2775,7 +2786,7 @@ checksum = "35391ea974fa5ee869cb094d5b437688fbf3d8127d64d1b9fed5822a1ed39b12" [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" [[package]] name = "sp-storage" @@ -2784,7 +2795,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86af458d4a0251c490cdde9dcaaccb88d398f3b97ac6694cdd49ed9337e6b961" dependencies = [ "impl-serde", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "ref-cast", "serde", "sp-debug-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2794,10 +2805,10 @@ dependencies = [ [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "impl-serde", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "ref-cast", "serde", "sp-debug-derive 3.0.0 (git+https://github.com/paritytech/substrate)", @@ -2807,7 +2818,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate)", @@ -2824,7 +2835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567382d8d4e14fb572752863b5cd57a78f9e9a6583332b590b726f061f3ea957" dependencies = [ "log", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "sp-std 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "tracing-core", @@ -2834,10 +2845,10 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "sp-std 3.0.0 (git+https://github.com/paritytech/substrate)", "tracing", "tracing-core", @@ -2847,11 +2858,11 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "hash-db", "memory-db 0.26.0", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "sp-core 3.0.0 (git+https://github.com/paritytech/substrate)", "sp-std 3.0.0 (git+https://github.com/paritytech/substrate)", "trie-db 0.22.3", @@ -2861,10 +2872,10 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "impl-serde", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "serde", "sp-runtime", "sp-std 3.0.0 (git+https://github.com/paritytech/substrate)", @@ -2877,7 +2888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b214e125666a6416cf30a70cc6a5dacd34a4e5197f8a3d479f714af7e1dc7a47" dependencies = [ "impl-trait-for-tuples 0.2.1", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "sp-std 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi", ] @@ -2885,10 +2896,10 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "impl-trait-for-tuples 0.2.1", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "sp-std 3.0.0 (git+https://github.com/paritytech/substrate)", "wasmi", ] @@ -2919,7 +2930,7 @@ checksum = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" [[package]] name = "substrate-adapter" -version = "0.8.28-6aa73f2" +version = "0.8.28-e6fcc2a" dependencies = [ "base64", "blake2-rfc", @@ -2931,7 +2942,7 @@ dependencies = [ "hostapi-runtime", "keccak-hasher", "memory-db 0.20.1", - "parity-scale-codec 2.0.1", + "parity-scale-codec 2.0.0", "primitive-types 0.2.4", "reference-trie", "sc-executor", @@ -3055,18 +3066,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2", "quote", @@ -3136,9 +3147,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -3148,9 +3159,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" +checksum = "41768be5b9f3489491825f56f01f25290aa1d3e7cc97e182d4d34360493ba6fa" dependencies = [ "proc-macro2", "quote", diff --git a/test/adapters/substrate/Cargo.toml b/test/adapters/substrate/Cargo.toml index 7be7f6a10..f16e45334 100644 --- a/test/adapters/substrate/Cargo.toml +++ b/test/adapters/substrate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "substrate-adapter" -version = "0.8.28-6aa73f2" +version = "0.8.28-e6fcc2a" authors = ["Skalman "] edition = "2018" From b10f9f1d9011d494f77a342e46b540d477e5ef75 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Mon, 15 Mar 2021 16:34:47 +0100 Subject: [PATCH 3/5] tester-runtime: 6aa73f2 -> e6fcc2a --- test/runtimes/tester/Cargo.lock | 276 +++++++++++++----------- test/runtimes/tester/Cargo.toml | 2 +- test/runtimes/tester/runtime/Cargo.toml | 2 +- 3 files changed, 157 insertions(+), 123 deletions(-) diff --git a/test/runtimes/tester/Cargo.lock b/test/runtimes/tester/Cargo.lock index de713acca..87be34cfd 100644 --- a/test/runtimes/tester/Cargo.lock +++ b/test/runtimes/tester/Cargo.lock @@ -624,9 +624,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.58" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" [[package]] name = "cfg-if" @@ -854,6 +854,16 @@ dependencies = [ "sct", ] +[[package]] +name = "ctor" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "cuckoofilter" version = "0.5.0" @@ -1154,7 +1164,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", ] @@ -1172,11 +1182,12 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-support", "frame-system", "linregress", + "log", "parity-scale-codec", "paste 1.0.4", "sp-api", @@ -1190,7 +1201,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-support", "frame-system", @@ -1206,7 +1217,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "serde", @@ -1217,7 +1228,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "bitflags", "frame-metadata", @@ -1243,7 +1254,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1255,10 +1266,10 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -1267,7 +1278,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "proc-macro2", "quote", @@ -1277,10 +1288,11 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-support", "impl-trait-for-tuples", + "log", "parity-scale-codec", "serde", "sp-core", @@ -1707,7 +1719,7 @@ dependencies = [ [[package]] name = "host-tester" -version = "0.8.28-6aa73f2" +version = "0.8.28-e6fcc2a" dependencies = [ "sc-service", "sp-consensus-babe", @@ -2054,7 +2066,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -2682,11 +2694,12 @@ dependencies = [ [[package]] name = "log" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", + "value-bag", ] [[package]] @@ -2930,7 +2943,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2", "quote", @@ -3108,7 +3121,7 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-support", "frame-system", @@ -3123,11 +3136,12 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "pallet-timestamp", @@ -3141,17 +3155,17 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", - "sp-timestamp", ] [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "serde", "sp-runtime", @@ -3161,11 +3175,12 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", @@ -3182,7 +3197,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-support", "frame-system", @@ -3195,7 +3210,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-support", "frame-system", @@ -3215,7 +3230,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-support", "frame-system", @@ -3229,12 +3244,13 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", + "log", "parity-scale-codec", "serde", "sp-inherents", @@ -3280,7 +3296,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9029e65297c7fd6d7013f0579e193ec2b34ae78eabca854c9417504ad8a2d214" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -3690,6 +3706,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4029,9 +4055,9 @@ checksum = "53552c6c49e1e13f1a203ef0080ab3bbef0beb570a528993e83df057a9d9bba1" [[package]] name = "ring" -version = "0.16.15" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", "libc", @@ -4166,7 +4192,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -4182,7 +4208,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -4203,9 +4229,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -4214,7 +4240,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", "fnv", @@ -4248,7 +4274,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "blake2-rfc", "hash-db", @@ -4276,7 +4302,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "sc-client-api", "sp-blockchain", @@ -4287,7 +4313,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", "fork-tree", @@ -4333,7 +4359,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "fork-tree", "parity-scale-codec", @@ -4346,7 +4372,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -4372,7 +4398,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", "sc-client-api", @@ -4386,7 +4412,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", "lazy_static", @@ -4414,7 +4440,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", "parity-scale-codec", @@ -4430,7 +4456,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", "parity-scale-codec", @@ -4445,7 +4471,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", "dyn-clone", @@ -4484,7 +4510,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "ansi_term", "futures 0.3.12", @@ -4502,7 +4528,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "async-trait", "derive_more", @@ -4522,7 +4548,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "hash-db", "lazy_static", @@ -4541,7 +4567,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "async-std", "async-trait", @@ -4594,7 +4620,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -4610,12 +4636,13 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "bytes 0.5.6", "fnv", "futures 0.3.12", "futures-timer 3.0.2", + "hex", "hyper 0.13.9", "hyper-rustls", "log", @@ -4637,7 +4664,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.3.12", "libp2p", @@ -4650,7 +4677,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.3.12", "hash-db", @@ -4684,7 +4711,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", "futures 0.3.12", @@ -4708,7 +4735,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -4726,7 +4753,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "directories", "exit-future", @@ -4789,7 +4816,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", "parity-scale-codec", @@ -4804,7 +4831,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "chrono", "futures 0.3.12", @@ -4815,10 +4842,8 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "sp-utils", "take_mut", - "tracing", - "tracing-subscriber", + "thiserror", "void", "wasm-timer", ] @@ -4826,7 +4851,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "ansi_term", "atty", @@ -4837,7 +4862,6 @@ dependencies = [ "parking_lot 0.11.1", "regex", "rustc-hash", - "sc-telemetry", "sc-tracing-proc-macro", "serde", "serde_json", @@ -4854,9 +4878,9 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -4865,7 +4889,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", "futures 0.3.12", @@ -4887,7 +4911,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.3.12", "futures-diagnose", @@ -5235,7 +5259,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", "sp-core", @@ -5247,9 +5271,10 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "hash-db", + "log", "parity-scale-codec", "sp-api-proc-macro", "sp-core", @@ -5263,10 +5288,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "blake2-rfc", - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -5275,7 +5300,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "serde", @@ -5287,7 +5312,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "integer-sqrt", "num-traits", @@ -5300,7 +5325,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -5311,7 +5336,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "sp-api", @@ -5323,7 +5348,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.3.12", "log", @@ -5341,7 +5366,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "serde", "serde_json", @@ -5350,7 +5375,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -5376,10 +5401,11 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "merlin", "parity-scale-codec", + "serde", "sp-api", "sp-application-crypto", "sp-consensus", @@ -5396,7 +5422,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -5406,7 +5432,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -5418,7 +5444,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "base58", "blake2-rfc", @@ -5462,7 +5488,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -5471,7 +5497,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "proc-macro2", "quote", @@ -5481,7 +5507,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "environmental", "parity-scale-codec", @@ -5492,7 +5518,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "finality-grandpa", "log", @@ -5509,7 +5535,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", @@ -5521,7 +5547,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.3.12", "hash-db", @@ -5545,7 +5571,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "async-trait", "derive_more", @@ -5562,7 +5588,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "sp-api", "sp-core", @@ -5572,7 +5598,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "backtrace", ] @@ -5580,7 +5606,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "serde", "sp-core", @@ -5589,7 +5615,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "either", "hash256-std-hasher", @@ -5610,7 +5636,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5627,10 +5653,10 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -5639,7 +5665,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "serde", "serde_json", @@ -5648,7 +5674,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "sp-api", @@ -5661,7 +5687,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -5671,7 +5697,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "hash-db", "log", @@ -5693,12 +5719,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "impl-serde", "parity-scale-codec", @@ -5711,7 +5737,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", "sp-core", @@ -5724,9 +5750,8 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ - "impl-trait-for-tuples", "parity-scale-codec", "sp-api", "sp-inherents", @@ -5738,7 +5763,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "log", "parity-scale-codec", @@ -5751,7 +5776,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "derive_more", "futures 0.3.12", @@ -5767,7 +5792,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "hash-db", "memory-db", @@ -5781,7 +5806,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "futures 0.3.12", "futures-core", @@ -5793,7 +5818,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "impl-serde", "parity-scale-codec", @@ -5805,7 +5830,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5868,7 +5893,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate#da7ca4db778fc91323a8a0143e5ca013fe0ce4c9" dependencies = [ "async-std", "derive_more", @@ -5958,7 +5983,7 @@ dependencies = [ [[package]] name = "tester-runtime" -version = "0.8.28-6aa73f2" +version = "0.8.28-e6fcc2a" dependencies = [ "frame-executive", "frame-support", @@ -5989,18 +6014,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2", "quote", @@ -6343,9 +6368,9 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" dependencies = [ "cfg-if 1.0.0", "log", @@ -6356,9 +6381,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" +checksum = "41768be5b9f3489491825f56f01f25290aa1d3e7cc97e182d4d34360493ba6fa" dependencies = [ "proc-macro2", "quote", @@ -6596,6 +6621,15 @@ dependencies = [ "percent-encoding 2.1.0", ] +[[package]] +name = "value-bag" +version = "1.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1" +dependencies = [ + "ctor", +] + [[package]] name = "vcpkg" version = "0.2.10" diff --git a/test/runtimes/tester/Cargo.toml b/test/runtimes/tester/Cargo.toml index fbc9bca55..196cae3fb 100644 --- a/test/runtimes/tester/Cargo.toml +++ b/test/runtimes/tester/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'host-tester' -version = "0.8.28-6aa73f2" +version = "0.8.28-e6fcc2a" edition = '2018' diff --git a/test/runtimes/tester/runtime/Cargo.toml b/test/runtimes/tester/runtime/Cargo.toml index 131612398..67fbc4056 100644 --- a/test/runtimes/tester/runtime/Cargo.toml +++ b/test/runtimes/tester/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'tester-runtime' -version = "0.8.28-6aa73f2" +version = "0.8.28-e6fcc2a" edition = '2018' [profile.release] From 33247946bdba611500549477804658dc223d2c8a Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Mon, 15 Mar 2021 21:05:12 +0100 Subject: [PATCH 4/5] substrate-adapter: update offchain extension api --- test/adapters/substrate/src/host_api/utils.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/adapters/substrate/src/host_api/utils.rs b/test/adapters/substrate/src/host_api/utils.rs index 1126eea14..33234ee67 100644 --- a/test/adapters/substrate/src/host_api/utils.rs +++ b/test/adapters/substrate/src/host_api/utils.rs @@ -10,7 +10,7 @@ use sc_executor::{ use sp_io::SubstrateHostFunctions; use sp_core::{ offchain::testing::TestOffchainExt, - offchain::OffchainExt, + offchain::OffchainWorkerExt, traits::MissingHostFunctions, Blake2Hasher, }; @@ -89,7 +89,7 @@ impl Runtime { #[allow(dead_code)] pub fn with_offchain(mut self) -> Self { let (offchain, _) = TestOffchainExt::new(); - self.ext.register_extension(OffchainExt::new(offchain)); + self.ext.register_extension(OffchainWorkerExt::new(offchain)); self } pub fn call(&mut self, func: &str, args: &[u8]) -> Vec { From 06ff721ed35a8df5e70c6e99ab5be2110fdee225 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Mon, 15 Mar 2021 21:31:09 +0100 Subject: [PATCH 5/5] tester-runtime: update genesis and seed api --- test/runtimes/tester/runtime/src/lib.rs | 13 +++-- test/runtimes/tester/src/main.rs | 69 +++++++++++++------------ 2 files changed, 45 insertions(+), 37 deletions(-) diff --git a/test/runtimes/tester/runtime/src/lib.rs b/test/runtimes/tester/runtime/src/lib.rs index 380bd5ecc..d91623f85 100644 --- a/test/runtimes/tester/runtime/src/lib.rs +++ b/test/runtimes/tester/runtime/src/lib.rs @@ -98,6 +98,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { transaction_version: 1, }; +/// The BABE epoch configuration at genesis. +pub const BABE_GENESIS_EPOCH_CONFIG: sp_babe::BabeEpochConfiguration = + sp_babe::BabeEpochConfiguration { + c: PRIMARY_PROBABILITY, + allowed_slots: sp_babe::AllowedSlots::PrimarySlots, + }; + /// Targeted block time. pub const MILLISECS_PER_BLOCK: Moment = 6000; @@ -368,7 +375,7 @@ impl_runtime_apis! { fn random_seed() -> ::Hash { print("@@random_seed()@@"); - CollectiveFlip::random_seed() + CollectiveFlip::random_seed().0 } } // block builder @@ -403,10 +410,10 @@ impl_runtime_apis! { sp_babe::BabeGenesisConfiguration { slot_duration: Babe::slot_duration(), epoch_length: EpochDuration::get(), - c: PRIMARY_PROBABILITY, + c: BABE_GENESIS_EPOCH_CONFIG.c, genesis_authorities: Babe::authorities(), randomness: Babe::randomness(), - allowed_slots: sp_babe::AllowedSlots::PrimaryAndSecondaryPlainSlots, + allowed_slots: BABE_GENESIS_EPOCH_CONFIG.allowed_slots, } } diff --git a/test/runtimes/tester/src/main.rs b/test/runtimes/tester/src/main.rs index f3d50058c..0dd27c76c 100644 --- a/test/runtimes/tester/src/main.rs +++ b/test/runtimes/tester/src/main.rs @@ -1,8 +1,8 @@ use sp_core::{Pair, Public, sr25519}; use tester_runtime::{ - AccountId, BabeConfig, BalancesConfig, GenesisConfig, - GrandpaConfig, SudoConfig, SystemConfig, Signature, - WASM_BINARY, + AccountId, BabeConfig, BalancesConfig, GenesisConfig, + GrandpaConfig, SudoConfig, SystemConfig, Signature, + BABE_GENESIS_EPOCH_CONFIG, WASM_BINARY, }; use sc_service::{GenericChainSpec, ChainType}; use sp_runtime::traits::{Verify, IdentifyAccount}; @@ -10,7 +10,7 @@ use sp_runtime::traits::{Verify, IdentifyAccount}; use sp_babe::AuthorityId as BabeId; use sp_grandpa::AuthorityId as GrandpaId; -/// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. +/// Specialized `ChainSpec` of the general Substrate ChainSpec type. type ChainSpec = GenericChainSpec; /// Helper function to generate a crypto pair from seed @@ -31,47 +31,48 @@ fn get_account_id_from_seed(seed: &str) -> AccountId where /// Create default genesis config fn default_genesis_config() -> GenesisConfig { - GenesisConfig { - system: Some(SystemConfig { - code: WASM_BINARY.unwrap().to_vec(), + GenesisConfig { + system: SystemConfig { + code: WASM_BINARY.unwrap().to_vec(), changes_trie_config: Default::default(), - }), - balances: Some(BalancesConfig { + }, + balances: BalancesConfig { balances: vec![ - get_account_id_from_seed::("Alice"), + get_account_id_from_seed::("Alice"), get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Alice//stash"), get_account_id_from_seed::("Bob//stash"), ].iter().cloned().map(|k|(k, 1 << 60)).collect(), - }), - babe: Some(BabeConfig { - authorities: vec![ - (get_from_seed::("Alice"), 1), - (get_from_seed::("Bob") , 1), - ], - }), - grandpa: Some(GrandpaConfig { - authorities: vec![ - (get_from_seed::("Alice"), 1), - (get_from_seed::("Bob") , 1), - ], - }), - sudo: Some(SudoConfig { + }, + babe: BabeConfig { + authorities: vec![ + (get_from_seed::("Alice"), 1), + (get_from_seed::("Bob"), 1), + ], + epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG), + }, + grandpa: GrandpaConfig { + authorities: vec![ + (get_from_seed::("Alice"), 1), + (get_from_seed::("Bob"), 1), + ], + }, + sudo: SudoConfig { key: get_account_id_from_seed::("Alice"), - }), + }, } } /// Create default chain specification fn default_chain_spec() -> ChainSpec { - ChainSpec::from_genesis( + ChainSpec::from_genesis( "Specification Conformance Test", "spectest", - ChainType::Development, - default_genesis_config, + ChainType::Development, + default_genesis_config, vec![], // Bootnodes - None, // Telemetry + None, // Telemetry None, // Protocol Id None, // Properties None, // Extensions @@ -79,10 +80,10 @@ fn default_chain_spec() -> ChainSpec { } fn main() { - let raw = true; + let raw = true; - match default_chain_spec().as_json(raw) { - Ok(json) => println!("{}", json), - Err(err) => eprintln!("Error: {}", err), - } + match default_chain_spec().as_json(raw) { + Ok(json) => println!("{}", json), + Err(err) => eprintln!("Error: {}", err), + } }