From e5e4ce3125530ba7af8a1ad5cbecbaeb455bd4ea Mon Sep 17 00:00:00 2001
From: bgallois <benjamin@gallois.cc>
Date: Fri, 2 Feb 2024 15:32:16 +0100
Subject: [PATCH] upgrade cucumber
---
Cargo.lock | 398 +++++++++++++-------------
end2end-tests/Cargo.toml | 19 +-
end2end-tests/tests/cucumber_tests.rs | 32 +--
3 files changed, 217 insertions(+), 232 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 026013d64..6b7197d51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -650,7 +650,7 @@ dependencies = [
"futures-lite",
"parking",
"polling",
- "rustix 0.38.30",
+ "rustix 0.38.31",
"slab",
"tracing",
"windows-sys 0.52.0",
@@ -701,7 +701,7 @@ dependencies = [
"cfg-if 1.0.0",
"event-listener 4.0.3",
"futures-lite",
- "rustix 0.38.30",
+ "rustix 0.38.31",
"windows-sys 0.52.0",
]
@@ -717,7 +717,7 @@ dependencies = [
"cfg-if 1.0.0",
"futures-core",
"futures-io",
- "rustix 0.38.30",
+ "rustix 0.38.31",
"signal-hook-registry",
"slab",
"windows-sys 0.48.0",
@@ -1362,23 +1362,6 @@ dependencies = [
"libloading",
]
-[[package]]
-name = "clap"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_derive 3.2.25",
- "clap_lex 0.2.4",
- "indexmap 1.9.3",
- "once_cell",
- "strsim",
- "termcolor",
- "textwrap 0.16.0",
-]
-
[[package]]
name = "clap"
version = "4.4.18"
@@ -1386,7 +1369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
dependencies = [
"clap_builder",
- "clap_derive 4.4.7",
+ "clap_derive",
]
[[package]]
@@ -1397,7 +1380,7 @@ checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
dependencies = [
"anstream",
"anstyle",
- "clap_lex 0.6.0",
+ "clap_lex",
"strsim",
"terminal_size",
]
@@ -1408,20 +1391,7 @@ version = "4.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df631ae429f6613fcd3a7c1adbdb65f637271e561b03680adaa6573015dfb106"
dependencies = [
- "clap 4.4.18",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "clap",
]
[[package]]
@@ -1436,15 +1406,6 @@ dependencies = [
"syn 2.0.48",
]
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
[[package]]
name = "clap_lex"
version = "0.6.0"
@@ -1917,16 +1878,6 @@ dependencies = [
"subtle 2.5.0",
]
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "ctr"
version = "0.9.2"
@@ -1948,56 +1899,62 @@ dependencies = [
[[package]]
name = "cucumber"
-version = "0.11.3"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c2113609da80892316eeacd21e63c359536814b07146d4caa17ad7676e0db3"
+checksum = "8e5063d8cf24f4998ad01cac265da468a15ca682a8f4f826d50e661964e8d9b8"
dependencies = [
+ "anyhow",
"async-trait",
- "atty",
- "clap 3.2.25",
+ "clap",
"console",
"cucumber-codegen",
"cucumber-expressions",
"derive_more",
+ "drain_filter_polyfill",
"either",
"futures 0.3.30",
"gherkin",
"globwalk",
+ "humantime",
"inventory",
- "itertools 0.10.5",
+ "itertools 0.12.1",
+ "lazy-regex",
"linked-hash-map",
"once_cell",
+ "pin-project",
"regex",
- "sealed 0.4.0",
+ "sealed",
+ "smart-default",
]
[[package]]
name = "cucumber-codegen"
-version = "0.11.3"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57569af2742cb38e213e8cc686fffc76e0ee4119cad3a122753c27107dc26e58"
+checksum = "01091e28d1f566c8b31b67948399d2efd6c0a8f6228a9785519ed7b73f7f0aef"
dependencies = [
"cucumber-expressions",
"inflections",
- "itertools 0.10.5",
+ "itertools 0.12.1",
"proc-macro2",
"quote",
"regex",
- "syn 1.0.109",
+ "syn 2.0.48",
"synthez",
]
[[package]]
name = "cucumber-expressions"
-version = "0.1.2"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a512c03bf9dbe0abcd486181027bddf2cc2153b8cb258b3b27e29dee621daa"
+checksum = "d794fed319eea24246fb5f57632f7ae38d61195817b7eb659455aa5bdd7c1810"
dependencies = [
"derive_more",
"either",
"nom",
"nom_locate",
"regex",
+ "regex-syntax 0.7.5",
]
[[package]]
@@ -2110,12 +2067,12 @@ dependencies = [
[[package]]
name = "darling"
-version = "0.20.4"
+version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da01daa5f6d41c91358398e8db4dde38e292378da1f28300b59ef4732b879454"
+checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8"
dependencies = [
- "darling_core 0.20.4",
- "darling_macro 0.20.4",
+ "darling_core 0.20.5",
+ "darling_macro 0.20.5",
]
[[package]]
@@ -2134,9 +2091,9 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.20.4"
+version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44f6238b948a3c6c3073cdf53bb0c2d5e024ee27e0f35bfe9d556a12395808a"
+checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3"
dependencies = [
"fnv",
"ident_case",
@@ -2159,11 +2116,11 @@ dependencies = [
[[package]]
name = "darling_macro"
-version = "0.20.4"
+version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d2d88bd93979b1feb760a6b5c531ac5ba06bd63e74894c377af02faee07b9cd"
+checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77"
dependencies = [
- "darling_core 0.20.4",
+ "darling_core 0.20.5",
"quote",
"syn 2.0.48",
]
@@ -2373,7 +2330,7 @@ name = "distance-oracle"
version = "0.1.0"
dependencies = [
"bincode",
- "clap 4.4.18",
+ "clap",
"dubp-wot",
"flate2",
"fnv",
@@ -2431,7 +2388,7 @@ dependencies = [
"regex",
"syn 2.0.48",
"termcolor",
- "toml 0.8.8",
+ "toml 0.8.9",
"walkdir",
]
@@ -2447,6 +2404,12 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+[[package]]
+name = "drain_filter_polyfill"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "669a445ee724c5c69b1b06fe0b63e70a1c84bc9bb7d9696cd4f4e3ec45050408"
+
[[package]]
name = "dtoa"
version = "1.0.9"
@@ -2472,7 +2435,7 @@ version = "0.7.1"
dependencies = [
"async-io",
"bs58 0.5.0",
- "clap 4.4.18",
+ "clap",
"clap_complete",
"common-runtime",
"dc-distance",
@@ -2558,7 +2521,7 @@ version = "3.0.0"
dependencies = [
"anyhow",
"async-trait",
- "clap 3.2.25",
+ "clap",
"ctrlc",
"cucumber",
"distance-oracle",
@@ -3097,7 +3060,7 @@ dependencies = [
"Inflector",
"array-bytes 6.2.2",
"chrono",
- "clap 4.4.18",
+ "clap",
"comfy-table",
"frame-benchmarking",
"frame-support",
@@ -3779,32 +3742,21 @@ dependencies = [
[[package]]
name = "gherkin"
-version = "0.11.2"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7916b3cc60fa87903b2d62fbe7fd9c346fb9f8d4cb8d1717c482b37605016ad"
+checksum = "20b79820c0df536d1f3a089a2fa958f61cb96ce9e0f3f8f507f5a31179567755"
dependencies = [
- "heck 0.3.3",
+ "heck 0.4.1",
"peg",
"quote",
"serde",
"serde_json",
- "syn 1.0.109",
- "textwrap 0.12.1",
+ "syn 2.0.48",
+ "textwrap",
"thiserror",
"typed-builder",
]
-[[package]]
-name = "ghost"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0e085ded9f1267c32176b40921b9754c474f7dd96f7e808d4a982e48aa1e854"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
[[package]]
name = "gimli"
version = "0.27.3"
@@ -4028,7 +3980,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http",
- "indexmap 2.2.1",
+ "indexmap 2.2.2",
"slab",
"tokio",
"tokio-util",
@@ -4469,9 +4421,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.2.1"
+version = "2.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b"
+checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
dependencies = [
"equivalent",
"hashbrown 0.14.3",
@@ -4551,13 +4503,9 @@ dependencies = [
[[package]]
name = "inventory"
-version = "0.2.3"
+version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84344c6e0b90a9e2b6f3f9abe5cc74402684e348df7b32adca28747e0cef091a"
-dependencies = [
- "ctor",
- "ghost",
-]
+checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
[[package]]
name = "io-lifetimes"
@@ -4610,7 +4558,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
dependencies = [
"hermit-abi 0.3.4",
- "rustix 0.38.30",
+ "rustix 0.38.31",
"windows-sys 0.52.0",
]
@@ -4961,6 +4909,29 @@ dependencies = [
"smallvec",
]
+[[package]]
+name = "lazy-regex"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c"
+dependencies = [
+ "lazy-regex-proc_macros",
+ "once_cell",
+ "regex",
+]
+
+[[package]]
+name = "lazy-regex-proc_macros"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.48",
+]
+
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -4975,9 +4946,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.152"
+version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "libloading"
@@ -5701,7 +5672,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
dependencies = [
- "rustix 0.38.30",
+ "rustix 0.38.31",
]
[[package]]
@@ -6223,6 +6194,12 @@ dependencies = [
"num-traits 0.2.17",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-format"
version = "0.4.4"
@@ -6354,9 +6331,6 @@ name = "once_cell"
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-dependencies = [
- "parking_lot_core 0.9.9",
-]
[[package]]
name = "opaque-debug"
@@ -6420,12 +6394,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-[[package]]
-name = "os_str_bytes"
-version = "6.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
-
[[package]]
name = "pallet-atomic-swap"
version = "4.0.0-dev"
@@ -7332,7 +7300,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
"fixedbitset",
- "indexmap 2.2.1",
+ "indexmap 2.2.2",
]
[[package]]
@@ -7425,7 +7393,7 @@ dependencies = [
"cfg-if 1.0.0",
"concurrent-queue",
"pin-project-lite 0.2.13",
- "rustix 0.38.30",
+ "rustix 0.38.31",
"tracing",
"windows-sys 0.52.0",
]
@@ -7568,7 +7536,7 @@ version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
dependencies = [
- "toml_edit 0.21.0",
+ "toml_edit 0.21.1",
]
[[package]]
@@ -8014,6 +7982,12 @@ version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+[[package]]
+name = "regex-syntax"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
[[package]]
name = "regex-syntax"
version = "0.8.2"
@@ -8022,9 +7996,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "reqwest"
-version = "0.11.23"
+version = "0.11.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
+checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
dependencies = [
"base64 0.21.7",
"bytes",
@@ -8044,9 +8018,11 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite 0.2.13",
+ "rustls-pemfile 1.0.4",
"serde",
"serde_json",
"serde_urlencoded",
+ "sync_wrapper",
"system-configuration",
"tokio",
"tokio-native-tls",
@@ -8230,9 +8206,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.30"
+version = "0.38.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
dependencies = [
"bitflags 2.4.2",
"errno",
@@ -8506,7 +8482,7 @@ dependencies = [
"array-bytes 6.2.2",
"bip39",
"chrono",
- "clap 4.4.18",
+ "clap",
"fdlimit",
"futures 0.3.30",
"itertools 0.10.5",
@@ -9658,26 +9634,14 @@ dependencies = [
[[package]]
name = "sealed"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "636b9882a0f4cc2039488df89a10eb4b7976d4b6c1917fc0518f3f0f5e2c72ca"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "sealed"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b5e421024b5e5edfbaa8e60ecf90bda9dbffc602dbb230e6028763f85f0c68c"
+checksum = "f4a8caec23b7800fb97971a1c6ae365b6239aaeddfb934d6265f8505e795699d"
dependencies = [
- "heck 0.3.3",
+ "heck 0.4.1",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
@@ -9696,9 +9660,9 @@ dependencies = [
[[package]]
name = "secp256k1"
-version = "0.28.1"
+version = "0.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f622567e3b4b38154fb8190bcf6b160d7a4301d70595a49195b48c116007a27"
+checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10"
dependencies = [
"secp256k1-sys",
]
@@ -9835,7 +9799,7 @@ version = "0.9.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e"
dependencies = [
- "indexmap 2.2.1",
+ "indexmap 2.2.2",
"itoa",
"ryu",
"serde",
@@ -9998,6 +9962,23 @@ version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+[[package]]
+name = "smart-default"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "smawk"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
+
[[package]]
name = "smol"
version = "2.0.0"
@@ -10441,7 +10422,7 @@ dependencies = [
[[package]]
name = "sp-crypto-ec-utils"
version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a190e0e9253562fdca9c1b6e9541a7ea0a50c018"
+source = "git+https://github.com/paritytech/polkadot-sdk#5ba8921787609dddbabb8be3443186b65fdde190"
dependencies = [
"ark-bls12-377",
"ark-bls12-377-ext",
@@ -10481,7 +10462,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a190e0e9253562fdca9c1b6e9541a7ea0a50c018"
+source = "git+https://github.com/paritytech/polkadot-sdk#5ba8921787609dddbabb8be3443186b65fdde190"
dependencies = [
"proc-macro2",
"quote",
@@ -10517,7 +10498,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a190e0e9253562fdca9c1b6e9541a7ea0a50c018"
+source = "git+https://github.com/paritytech/polkadot-sdk#5ba8921787609dddbabb8be3443186b65fdde190"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -10716,7 +10697,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a190e0e9253562fdca9c1b6e9541a7ea0a50c018"
+source = "git+https://github.com/paritytech/polkadot-sdk#5ba8921787609dddbabb8be3443186b65fdde190"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -10747,7 +10728,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a190e0e9253562fdca9c1b6e9541a7ea0a50c018"
+source = "git+https://github.com/paritytech/polkadot-sdk#5ba8921787609dddbabb8be3443186b65fdde190"
dependencies = [
"Inflector",
"expander",
@@ -10839,7 +10820,7 @@ source = "git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-sub
[[package]]
name = "sp-std"
version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a190e0e9253562fdca9c1b6e9541a7ea0a50c018"
+source = "git+https://github.com/paritytech/polkadot-sdk#5ba8921787609dddbabb8be3443186b65fdde190"
[[package]]
name = "sp-storage"
@@ -10857,7 +10838,7 @@ dependencies = [
[[package]]
name = "sp-storage"
version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a190e0e9253562fdca9c1b6e9541a7ea0a50c018"
+source = "git+https://github.com/paritytech/polkadot-sdk#5ba8921787609dddbabb8be3443186b65fdde190"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -10895,7 +10876,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a190e0e9253562fdca9c1b6e9541a7ea0a50c018"
+source = "git+https://github.com/paritytech/polkadot-sdk#5ba8921787609dddbabb8be3443186b65fdde190"
dependencies = [
"parity-scale-codec",
"sp-std 14.0.0",
@@ -10996,7 +10977,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a190e0e9253562fdca9c1b6e9541a7ea0a50c018"
+source = "git+https://github.com/paritytech/polkadot-sdk#5ba8921787609dddbabb8be3443186b65fdde190"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
@@ -11231,7 +11212,7 @@ dependencies = [
"sp-maybe-compressed-blob",
"strum 0.24.1",
"tempfile",
- "toml 0.8.8",
+ "toml 0.8.9",
"walkdir",
"wasm-opt",
]
@@ -11254,7 +11235,7 @@ version = "3.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee5751d8385836e91a9b7c613e1e7e11f97a4c8a867d6f45f556497d2cfb53c1"
dependencies = [
- "clap 4.4.18",
+ "clap",
"fancy-regex",
"git-version",
"glob",
@@ -11345,7 +11326,7 @@ name = "subxt-macro"
version = "0.34.0"
source = "git+https://github.com/duniter/subxt?branch=subxt-v0.34.0-duniter-substrate-v1.6.0#b648c5e3a260d4e7d47df42d784ad4c723637411"
dependencies = [
- "darling 0.20.4",
+ "darling 0.20.5",
"parity-scale-codec",
"proc-macro-error",
"quote",
@@ -11388,6 +11369,12 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
[[package]]
name = "synstructure"
version = "0.12.6"
@@ -11402,35 +11389,35 @@ dependencies = [
[[package]]
name = "synthez"
-version = "0.2.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "033178d0acccffc5490021657006e6a8dd586ee9dc6f7c24e7608b125e568cb1"
+checksum = "a3d2c2202510a1e186e63e596d9318c91a8cbe85cd1a56a7be0c333e5f59ec8d"
dependencies = [
- "syn 1.0.109",
+ "syn 2.0.48",
"synthez-codegen",
"synthez-core",
]
[[package]]
name = "synthez-codegen"
-version = "0.2.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69263462a40e46960f070618e20094ce69e783a41f86e54bc75545136afd597a"
+checksum = "f724aa6d44b7162f3158a57bccd871a77b39a4aef737e01bcdff41f4772c7746"
dependencies = [
- "syn 1.0.109",
+ "syn 2.0.48",
"synthez-core",
]
[[package]]
name = "synthez-core"
-version = "0.2.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb8b5a4089fe1723279f06302afda64a5dacaa11a82bcbb4d08759590d4389d9"
+checksum = "78bfa6ec52465e2425fd43ce5bbbe0f0b623964f7c63feb6b10980e816c654ea"
dependencies = [
"proc-macro2",
"quote",
- "sealed 0.3.0",
- "syn 1.0.109",
+ "sealed",
+ "syn 2.0.48",
]
[[package]]
@@ -11475,7 +11462,7 @@ dependencies = [
"cfg-if 1.0.0",
"fastrand",
"redox_syscall 0.4.1",
- "rustix 0.38.30",
+ "rustix 0.38.31",
"windows-sys 0.52.0",
]
@@ -11510,7 +11497,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
dependencies = [
- "rustix 0.38.30",
+ "rustix 0.38.31",
"windows-sys 0.48.0",
]
@@ -11522,19 +11509,15 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
[[package]]
name = "textwrap"
-version = "0.12.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
dependencies = [
+ "smawk",
+ "unicode-linebreak",
"unicode-width",
]
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
[[package]]
name = "thiserror"
version = "1.0.56"
@@ -11592,13 +11575,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+checksum = "fe80ced77cbfb4cb91a94bf72b378b4b6791a0d9b7f09d0be747d1bdff4e68bd"
dependencies = [
"deranged",
"itoa",
"libc",
+ "num-conv",
"num_threads",
"powerfmt",
"serde",
@@ -11614,10 +11598,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.16"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
dependencies = [
+ "num-conv",
"time-core",
]
@@ -11647,9 +11632,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.35.1"
+version = "1.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
dependencies = [
"backtrace",
"bytes",
@@ -11755,14 +11740,14 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.8.8"
+version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.21.0",
+ "toml_edit 0.21.1",
]
[[package]]
@@ -11780,18 +11765,18 @@ version = "0.20.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
dependencies = [
- "indexmap 2.2.1",
+ "indexmap 2.2.2",
"toml_datetime",
"winnow",
]
[[package]]
name = "toml_edit"
-version = "0.21.0"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
dependencies = [
- "indexmap 2.2.1",
+ "indexmap 2.2.2",
"serde",
"serde_spanned",
"toml_datetime",
@@ -12010,7 +11995,7 @@ version = "0.10.0-dev"
source = "git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.6.0#c84530c57a6f9ab808a92f6b5d29338acf1c6e4f"
dependencies = [
"async-trait",
- "clap 4.4.18",
+ "clap",
"frame-remote-externalities",
"hex",
"log",
@@ -12059,13 +12044,22 @@ dependencies = [
[[package]]
name = "typed-builder"
-version = "0.7.1"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe83c85a85875e8c4cb9ce4a890f05b23d38cd0d47647db7895d3d2a79566d2"
+dependencies = [
+ "typed-builder-macro",
+]
+
+[[package]]
+name = "typed-builder-macro"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f85f4270f4f449a3f2c0cf2aecc8415e388a597aeacc7d55fc749c5c968c8533"
+checksum = "29a3151c41d0b13e3d011f98adc24434560ef06673a155a6c7f66b9879eecce2"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
@@ -12154,6 +12148,12 @@ version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
[[package]]
name = "unicode-normalization"
version = "0.1.22"
@@ -12771,7 +12771,7 @@ dependencies = [
"either",
"home",
"once_cell",
- "rustix 0.38.30",
+ "rustix 0.38.31",
]
[[package]]
@@ -13061,9 +13061,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "winnow"
-version = "0.5.35"
+version = "0.5.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d"
+checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249"
dependencies = [
"memchr",
]
@@ -13143,7 +13143,7 @@ name = "xtask"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap 4.4.18",
+ "clap",
"frame-metadata 16.0.0",
"graphql_client",
"hex",
diff --git a/end2end-tests/Cargo.toml b/end2end-tests/Cargo.toml
index a59b3faae..59e38b5e6 100644
--- a/end2end-tests/Cargo.toml
+++ b/end2end-tests/Cargo.toml
@@ -9,24 +9,23 @@ repository = 'https://git.duniter.org/nodes/rust/duniter-v2s'
version = '3.0.0'
[dev-dependencies]
-anyhow = "1.0"
-async-trait = "0.1.74"
-clap = { version = "3.2.23", features = ["derive", "cargo"] } # end2end cli refactoring need to upgrade to 4
-ctrlc = "3.2.2"
-cucumber = "0.11"
+anyhow = "1.0.79"
+clap = { version = "4.4.18", features = ["derive", "cargo"] }
+ctrlc = "3.4.2"
+cucumber = { version = "0.20.2", features = ["macros"] }
distance-oracle = { path = "../distance-oracle", default_features = false }
-env_logger = "0.9.0"
+env_logger = "0.11.1"
hex = "0.4.3"
-notify = "4.0"
-parity-scale-codec = "3.4.0"
+notify = "6.1.1"
+parity-scale-codec = "3.6.9"
portpicker = "0.1.1"
-serde_json = "1.0.96"
+serde_json = "1.0.113"
sp-core = { git = "https://github.com/duniter/duniter-polkadot-sdk", branch = "duniter-substrate-v1.6.0", default-features = false }
sp-core-hashing = { git = "https://github.com/duniter/duniter-polkadot-sdk", branch = "duniter-substrate-v1.6.0", default-features = false }
sp-runtime = { git = "https://github.com/duniter/duniter-polkadot-sdk", branch = "duniter-substrate-v1.6.0" }
sp-keyring = { git = "https://github.com/duniter/duniter-polkadot-sdk", branch = "duniter-substrate-v1.6.0" }
subxt = { git = 'https://github.com/duniter/subxt', branch = 'subxt-v0.34.0-duniter-substrate-v1.6.0', default-features = false, features = ["substrate-compat", "native", "jsonrpsee"] }
-tokio = { version = "1.28", features = ["macros", "time", "rt-multi-thread"], default-features = false }
+tokio = { version = "1.36.0", features = ["macros", "time", "rt-multi-thread"], default-features = false }
[[test]]
name = "cucumber_tests"
diff --git a/end2end-tests/tests/cucumber_tests.rs b/end2end-tests/tests/cucumber_tests.rs
index e63495dff..5c174c954 100644
--- a/end2end-tests/tests/cucumber_tests.rs
+++ b/end2end-tests/tests/cucumber_tests.rs
@@ -16,11 +16,10 @@
mod common;
-use async_trait::async_trait;
use common::*;
-use cucumber::{given, then, when, FailureWriter, World, WorldInit};
+use cucumber::StatsWriter;
+use cucumber::{given, then, when, World};
use sp_keyring::AccountKeyring;
-use std::convert::Infallible;
use std::path::PathBuf;
use std::str::FromStr;
use std::sync::{
@@ -31,7 +30,7 @@ use subxt::backend::rpc::RpcClient;
// ===== world =====
-#[derive(WorldInit)]
+#[derive(cucumber::World, Default)]
pub struct DuniterWorld {
ignore_errors: bool,
inner: Option<DuniterWorldInner>,
@@ -130,19 +129,6 @@ impl std::fmt::Debug for DuniterWorld {
}
}
-#[async_trait(?Send)]
-impl World for DuniterWorld {
- // We do require some error type.
- type Error = Infallible;
-
- async fn new() -> std::result::Result<Self, Infallible> {
- Ok(Self {
- ignore_errors: false,
- inner: None,
- })
- }
-}
-
struct DuniterWorldInner {
client: FullClient,
process: Option<Process>,
@@ -594,19 +580,19 @@ async fn identity_status_should_be(
#[derive(clap::Args)]
struct CustomOpts {
/// Keep running
- #[clap(short, long)]
+ #[arg(short, long)]
keep_running: bool,
/// Do not spawn a node, reuse expected node on port 9944
- #[clap(long)]
+ #[arg(long)]
no_spawn: bool,
/// For compliance with Jetbrains IDE which pushes extra args.
/// https://youtrack.jetbrains.com/issue/CPP-33071/cargo-test-adds-extra-options-which-conflict-with-Cucumber
- #[clap(short, long)]
+ #[arg(short, long)]
format: Option<String>,
- #[clap(short, long = "show-output")]
+ #[arg(short, long = "show-output")]
show_output: bool,
- #[clap(short = 'Z', long)]
+ #[arg(short = 'Z', long)]
z: Option<String>,
}
@@ -650,7 +636,7 @@ async fn main() {
world.set_ignore_errors(ignore_errors(&scenario.tags));
Box::pin(world.init(Some(genesis_conf_file_path), no_spawn))
})
- .after(move |_feature, _rule, _scenario, maybe_world| {
+ .after(move |_feature, _rule, _scenario, _ev, maybe_world| {
if keep_running {
while running.load(Ordering::SeqCst) {}
}
--
GitLab