diff --git a/.cargo/config b/.cargo/config index 0c7fb81b3670bdb406459426e220d958cb7f76e8..25ae43580a079384a24e03beae0a3a63e39babc8 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,3 +1,3 @@ [alias] -cucumber = "test -p duniter-integration-tests --test cucumber_tests --" -tu = "test --workspace --exclude duniter-integration-tests" +cucumber = "test -p duniter-end2end-tests --test cucumber_tests --" +tu = "test --workspace --exclude duniter-end2end-tests" diff --git a/.gitignore b/.gitignore index a9a5d7e7014e922b0142073e3d8de16356a2791a..fc0f4a9dd0e36fd02310b2919a833fee72efec49 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,9 @@ build # Temporary files tmp + +# Local chain spec +*local-spec*.json + +# Log files +*.log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37446e7d99231cda691b9fa38deebd993b16c6f3..8c3041139564db93acea1c3b0ca7a23378200e40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ build_debug_with_cache: build_release: extends: .env rules: - - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH =~ /^release/' + - if: "$CI_COMMIT_TAG || $CI_COMMIT_BRANCH =~ /^release/" - when: never stage: build script: @@ -117,9 +117,9 @@ tests_debug: stage: tests variables: DUNITER_BINARY_PATH: "../build/duniter" - DUNITER_INTEGRATION_TESTS_SPAWN_NODE_DURATION: "20" + DUNITER_END2END_TESTS_SPAWN_NODE_TIMEOUT: "20" script: - - cargo test --workspace --exclude duniter-integration-tests + - cargo test --workspace --exclude duniter-end2end-tests - cargo cucumber -i balance* - cargo cucumber -i monetary* - cargo cucumber -i transfer* @@ -127,14 +127,14 @@ tests_debug: tests_release: extends: .env rules: - - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH =~ /^release/' + - if: "$CI_COMMIT_TAG || $CI_COMMIT_BRANCH =~ /^release/" - when: never stage: tests variables: DUNITER_BINARY_PATH: "../build/duniter" DUNITER_INTEGRATION_TESTS_SPAWN_NODE_DURATION: "10" script: - - cargo test --workspace --exclude duniter-integration-tests + - cargo test --workspace --exclude duniter-end2end-tests - cargo cucumber -i monetary* - cargo cucumber -i *transfer* dependencies: diff --git a/Cargo.lock b/Cargo.lock index 35b7add92ce0c4cfb17b4d6d49bcf251a3c66576..4ca717d7da47f2b159b41ad367147eb6c462c472 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1299,12 +1299,13 @@ dependencies = [ ] [[package]] -name = "duniter-integration-tests" +name = "duniter-end2end-tests" version = "3.0.0" dependencies = [ "async-trait", "cucumber", "env_logger", + "notify", "parity-scale-codec", "portpicker", "serde_json", @@ -1455,6 +1456,18 @@ dependencies = [ "libc", ] +[[package]] +name = "filetime" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "winapi 0.3.9", +] + [[package]] name = "finality-grandpa" version = "0.14.4" @@ -1511,7 +1524,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", ] @@ -1529,7 +1542,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -1550,7 +1563,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "Inflector", "chrono", @@ -1576,7 +1589,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -1604,7 +1617,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "bitflags", "frame-metadata", @@ -1633,7 +1646,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1645,7 +1658,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -1657,7 +1670,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "proc-macro2", "quote", @@ -1667,7 +1680,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "log", @@ -1684,7 +1697,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-benchmarking", "frame-support", @@ -1699,7 +1712,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "sp-api", @@ -1727,6 +1740,25 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "fsevent" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" +dependencies = [ + "bitflags", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +dependencies = [ + "libc", +] + [[package]] name = "fsio" version = "0.1.3" @@ -2566,6 +2598,26 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" +[[package]] +name = "inotify" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + [[package]] name = "instant" version = "0.1.10" @@ -4028,6 +4080,24 @@ dependencies = [ "nom 7.1.0", ] +[[package]] +name = "notify" +version = "4.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +dependencies = [ + "bitflags", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio 0.6.23", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + [[package]] name = "ntapi" version = "0.3.6" @@ -4210,7 +4280,7 @@ dependencies = [ [[package]] name = "pallet-atomic-swap" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4225,7 +4295,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4261,7 +4331,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4276,7 +4346,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4300,7 +4370,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4378,7 +4448,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4418,7 +4488,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4455,7 +4525,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4469,7 +4539,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4485,7 +4555,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4499,7 +4569,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4514,7 +4584,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4535,7 +4605,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4549,7 +4619,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-benchmarking", "frame-support", @@ -4567,7 +4637,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -4584,7 +4654,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4601,7 +4671,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4647,7 +4717,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-support", "frame-system", @@ -5600,7 +5670,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "log", "sp-core", @@ -5611,7 +5681,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "futures-timer 3.0.2", @@ -5634,7 +5704,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5650,7 +5720,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -5667,7 +5737,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5678,7 +5748,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "chrono", "fdlimit", @@ -5716,7 +5786,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "fnv", "futures 0.3.19", @@ -5744,7 +5814,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "hash-db", "kvdb", @@ -5769,7 +5839,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "futures 0.3.19", @@ -5793,7 +5863,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "derive_more", @@ -5836,7 +5906,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5849,7 +5919,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "assert_matches", "async-trait", @@ -5883,7 +5953,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "futures 0.3.19", @@ -5908,7 +5978,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "sc-client-api", "sp-authorship", @@ -5919,7 +5989,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "lazy_static", "libsecp256k1", @@ -5946,7 +6016,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "derive_more", "environmental", @@ -5964,7 +6034,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "log", "parity-scale-codec", @@ -5980,7 +6050,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "derive_more", @@ -6017,7 +6087,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "ansi_term 0.12.1", "futures 0.3.19", @@ -6034,7 +6104,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "derive_more", @@ -6049,7 +6119,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-std", "async-trait", @@ -6100,7 +6170,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "futures-timer 3.0.2", @@ -6116,7 +6186,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "bytes 1.1.0", "fnv", @@ -6144,7 +6214,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "libp2p", @@ -6157,7 +6227,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -6166,7 +6236,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "hash-db", @@ -6197,7 +6267,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -6222,7 +6292,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -6239,7 +6309,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "directories", @@ -6303,7 +6373,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "log", "parity-scale-codec", @@ -6317,7 +6387,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "chrono", "futures 0.3.19", @@ -6335,7 +6405,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6366,7 +6436,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -6377,7 +6447,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "intervalier", @@ -6404,7 +6474,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "derive_more", "futures 0.3.19", @@ -6418,7 +6488,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "futures-timer 3.0.2", @@ -6819,7 +6889,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "hash-db", "log", @@ -6836,7 +6906,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -6848,7 +6918,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "scale-info", @@ -6861,7 +6931,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "integer-sqrt", "num-traits", @@ -6876,7 +6946,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "scale-info", @@ -6889,7 +6959,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "parity-scale-codec", @@ -6901,7 +6971,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "sp-api", @@ -6913,7 +6983,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "log", @@ -6931,7 +7001,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "futures 0.3.19", @@ -6950,7 +7020,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "merlin", @@ -6973,7 +7043,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "scale-info", @@ -6985,7 +7055,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6997,7 +7067,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "base58", "bitflags", @@ -7045,7 +7115,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "blake2-rfc", "byteorder", @@ -7058,7 +7128,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "proc-macro2", "quote", @@ -7069,7 +7139,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "kvdb", "parking_lot", @@ -7078,7 +7148,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "proc-macro2", "quote", @@ -7088,7 +7158,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "environmental", "parity-scale-codec", @@ -7099,7 +7169,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "finality-grandpa", "log", @@ -7117,7 +7187,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -7131,7 +7201,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "futures 0.3.19", "hash-db", @@ -7155,7 +7225,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "lazy_static", "sp-core", @@ -7166,7 +7236,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "derive_more", @@ -7183,7 +7253,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "zstd", ] @@ -7203,7 +7273,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "sp-api", "sp-core", @@ -7213,7 +7283,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "backtrace", "lazy_static", @@ -7223,7 +7293,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "rustc-hash", "serde", @@ -7233,7 +7303,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "either", "hash256-std-hasher", @@ -7256,7 +7326,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7273,7 +7343,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -7285,7 +7355,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "serde", "serde_json", @@ -7294,7 +7364,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "scale-info", @@ -7308,7 +7378,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "scale-info", @@ -7319,7 +7389,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "hash-db", "log", @@ -7342,12 +7412,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" [[package]] name = "sp-storage" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7360,7 +7430,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "log", "sp-core", @@ -7373,7 +7443,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -7389,7 +7459,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "sp-std", @@ -7401,7 +7471,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "sp-api", "sp-runtime", @@ -7410,7 +7480,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-trait", "log", @@ -7426,7 +7496,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "hash-db", "memory-db", @@ -7441,7 +7511,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7457,7 +7527,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -7468,7 +7538,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "impl-trait-for-tuples", "log", @@ -7595,7 +7665,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "platforms", ] @@ -7603,7 +7673,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.19", @@ -7625,7 +7695,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "async-std", "derive_more", @@ -7639,7 +7709,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#11b61d3d6d92396704b9d22657e5a280d5374420" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" dependencies = [ "ansi_term 0.12.1", "build-helper", diff --git a/Cargo.toml b/Cargo.toml index cc47fe186fc08d25a111bc47d2e4fd2ddff471e8..c64f85dc59445d4701b4fb608ed1ae5d96e643fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,7 +106,7 @@ substrate-frame-rpc-system = { git = "https://github.com/librelois/substrate.git resolver = "2" members = [ - 'integration-tests', + 'end2end-tests', 'pallets/certification', 'pallets/duniter-test-parameters', 'pallets/duniter-test-parameters/macro', diff --git a/integration-tests/Cargo.toml b/end2end-tests/Cargo.toml similarity index 89% rename from integration-tests/Cargo.toml rename to end2end-tests/Cargo.toml index 9bcb1a675ebd346ad4ccdf1f77e6db7a22ff4f52..5fbd68ae0f8b2af5ff4c72c6c185204834609b4f 100644 --- a/integration-tests/Cargo.toml +++ b/end2end-tests/Cargo.toml @@ -1,10 +1,10 @@ [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] -description = 'duniter integration tests.' +description = 'duniter end2end tests.' edition = '2018' homepage = 'https://substrate.dev' license = 'AGPL-3.0' -name = 'duniter-integration-tests' +name = 'duniter-end2end-tests' repository = 'https://git.duniter.org/nodes/rust/duniter-v2s' version = '3.0.0' @@ -12,6 +12,7 @@ version = '3.0.0' async-trait = "0.1" cucumber = "0.11" env_logger = "0.9.0" +notify = "4.0" parity-scale-codec = "2.3.1" portpicker = "0.1.1" serde_json = "1.0.64" diff --git a/integration-tests/README.md b/end2end-tests/README.md similarity index 100% rename from integration-tests/README.md rename to end2end-tests/README.md diff --git a/integration-tests/features/balance_transfer.feature b/end2end-tests/cucumber-features/balance_transfer.feature similarity index 100% rename from integration-tests/features/balance_transfer.feature rename to end2end-tests/cucumber-features/balance_transfer.feature diff --git a/integration-tests/features/monetary_mass.feature b/end2end-tests/cucumber-features/monetary_mass.feature similarity index 100% rename from integration-tests/features/monetary_mass.feature rename to end2end-tests/cucumber-features/monetary_mass.feature diff --git a/integration-tests/features/transfer_all.feature b/end2end-tests/cucumber-features/transfer_all.feature similarity index 100% rename from integration-tests/features/transfer_all.feature rename to end2end-tests/cucumber-features/transfer_all.feature diff --git a/integration-tests/src/lib.rs b/end2end-tests/src/lib.rs similarity index 100% rename from integration-tests/src/lib.rs rename to end2end-tests/src/lib.rs diff --git a/integration-tests/tests/common/balances.rs b/end2end-tests/tests/common/balances.rs similarity index 100% rename from integration-tests/tests/common/balances.rs rename to end2end-tests/tests/common/balances.rs diff --git a/integration-tests/tests/common/mod.rs b/end2end-tests/tests/common/mod.rs similarity index 56% rename from integration-tests/tests/common/mod.rs rename to end2end-tests/tests/common/mod.rs index 90770ed3e9378b218785dda1832f3678143f88fd..773cf7b242ff03344d592709c066cda42617c08b 100644 --- a/integration-tests/tests/common/mod.rs +++ b/end2end-tests/tests/common/mod.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with Substrate-Libre-Currency. If not, see <https://www.gnu.org/licenses/>. -#![allow(clippy::enum_variant_names)] +#![allow(clippy::enum_variant_names, dead_code, unused_imports)] pub mod balances; @@ -23,7 +23,9 @@ pub mod node_runtime {} use serde_json::Value; use sp_keyring::AccountKeyring; +use std::io::prelude::*; use std::process::Command; +use std::str::FromStr; use subxt::{ClientBuilder, DefaultConfig, DefaultExtra}; pub type Api = node_runtime::RuntimeApi<DefaultConfig, DefaultExtra<DefaultConfig>>; @@ -40,41 +42,23 @@ impl Drop for Process { } } +struct FullNode { + process: Process, + p2p_port: u16, + ws_port: u16, +} + pub async fn spawn_node() -> (Api, Client, Process) { let duniter_binary_path = std::env::var("DUNITER_BINARY_PATH") .unwrap_or_else(|_| "../target/debug/duniter".to_owned()); - - let p2p_port = portpicker::pick_unused_port().expect("No ports free"); - let rpc_port = portpicker::pick_unused_port().expect("No ports free"); - let ws_port = portpicker::pick_unused_port().expect("No ports free"); - let process = Process( - Command::new(duniter_binary_path) - .args([ - "--execution=Native", - "--no-telemetry", - "--no-prometheus", - "--dev", - "--sealing=manual", - "--tmp", - "--port", - &p2p_port.to_string(), - "--rpc-port", - &rpc_port.to_string(), - "--ws-port", - &ws_port.to_string(), - ]) - .spawn() - .expect("failed to spawn node"), + let FullNode { + process, + p2p_port: _, + ws_port, + } = spawn_full_node( + &duniter_binary_path, + &["--dev", "--execution=Native", "--sealing=manual"], ); - let duration_secs = if let Ok(duration_string) = - std::env::var("DUNITER_INTEGRATION_TESTS_SPAWN_NODE_DURATION") - { - duration_string.parse().unwrap_or(4) - } else { - 4 - }; - std::thread::sleep(std::time::Duration::from_secs(duration_secs)); - let client = ClientBuilder::new() .set_url(format!("ws://127.0.0.1:{}", ws_port)) .build() @@ -128,3 +112,84 @@ pub async fn create_block_with_extrinsic( .await .map_err(Into::into) } + +fn spawn_full_node(duniter_binary_path: &str, args: &[&str]) -> FullNode { + let p2p_port = portpicker::pick_unused_port().expect("No ports free"); + let rpc_port = portpicker::pick_unused_port().expect("No ports free"); + let ws_port = portpicker::pick_unused_port().expect("No ports free"); + let log_file_path = format!("duniter-v2s-{}.log", ws_port); + let log_file = std::fs::File::create(&log_file_path).expect("fail to create log file"); + let process = Process( + Command::new(duniter_binary_path) + .args( + [ + "--no-telemetry", + "--no-prometheus", + "--tmp", + "--port", + &p2p_port.to_string(), + "--rpc-port", + &rpc_port.to_string(), + "--ws-port", + &ws_port.to_string(), + ] + .iter() + .chain(args), + ) + .stdout(std::process::Stdio::null()) + .stderr(log_file) + .spawn() + .expect("failed to spawn node"), + ); + + let timeout = + if let Ok(duration_string) = std::env::var("DUNITER_END2END_TESTS_SPAWN_NODE_TIMEOUT") { + duration_string.parse().unwrap_or(4) + } else { + 4 + }; + + wait_until_log_line( + "***** Duniter has fully started *****", + &log_file_path, + std::time::Duration::from_secs(timeout), + ); + + FullNode { + process, + p2p_port, + ws_port, + } +} + +fn wait_until_log_line(expected_log_line: &str, log_file_path: &str, timeout: std::time::Duration) { + let (tx, rx) = std::sync::mpsc::channel(); + let mut watcher = notify::watcher(tx, std::time::Duration::from_millis(100)).unwrap(); + use notify::Watcher as _; + watcher + .watch(&log_file_path, notify::RecursiveMode::NonRecursive) + .unwrap(); + + let mut pos = 0; + loop { + match rx.recv_timeout(timeout) { + Ok(notify::DebouncedEvent::Write(_)) => { + let mut file = std::fs::File::open(&log_file_path).unwrap(); + file.seek(std::io::SeekFrom::Start(pos)).unwrap(); + pos = file.metadata().unwrap().len(); + let reader = std::io::BufReader::new(file); + + for line in reader.lines() { + if line.expect("fail to read line").contains(expected_log_line) { + return; + } + } + } + Ok(_) => {} + Err(err) => { + eprintln!("Error: {:?}", err); + std::process::exit(1); + } + } + } +} diff --git a/integration-tests/tests/cucumber_tests.rs b/end2end-tests/tests/cucumber_tests.rs similarity index 99% rename from integration-tests/tests/cucumber_tests.rs rename to end2end-tests/tests/cucumber_tests.rs index 2065d6b989d6d8dab2fa497c6fca4c67a9bf89fa..67b543d27b1c7d08e8ad5fe44e66cc5188cee4e3 100644 --- a/integration-tests/tests/cucumber_tests.rs +++ b/end2end-tests/tests/cucumber_tests.rs @@ -170,6 +170,6 @@ async fn main() { DuniterWorld::cucumber() //.fail_on_skipped() .max_concurrent_scenarios(4) - .run_and_exit("features") + .run_and_exit("cucumber-features") .await; } diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs index f256efabe2eb62d165ebce1dc2de26a863ec6ccc..64c7b1be123f02a8868f2918d33ec05bf941f3a3 100644 --- a/node/src/chain_spec/gdev.rs +++ b/node/src/chain_spec/gdev.rs @@ -206,7 +206,7 @@ fn gen_genesis_conf( assert!(initial_smiths_len <= initial_identities_len); assert!(initial_authorities_len <= initial_smiths_len); - let babe_epoch_duration = get_env_u32("DUNITER_BABE_EPOCH_DURATION", 600) as u64; + let babe_epoch_duration = get_env_u32("DUNITER_BABE_EPOCH_DURATION", 30) as u64; let cert_validity_period = get_env_u32("DUNITER_CERT_VALIDITY_PERIOD", 1_000); let membership_period = get_env_u32("DUNITER_MEMBERSHIP_PERIOD", 1_000); let membership_renewable_period = get_env_u32("DUNITER_MEMBERSHIP_RENEWABLE_PERIOD", 50); diff --git a/node/src/service.rs b/node/src/service.rs index 9c43ee358865dbb59a9f6b0d683efed1c1c7a850..9125e0e567519a7f65ab42631fd4a81df4797a9b 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -648,5 +648,8 @@ where } network_starter.start_network(); + + log::info!("***** Duniter has fully started *****"); + Ok(task_manager) } diff --git a/resources/metadata.scale b/resources/metadata.scale index cefb9d03d4f2322a12bd31296d58a8e253bad1a7..e7cb5e913808755149ae30d7d23c9f3f2befccd8 100644 Binary files a/resources/metadata.scale and b/resources/metadata.scale differ