From 2414dcbd8a739bc4183c84cb2e55c0e147306d0a Mon Sep 17 00:00:00 2001 From: Alain Brenzikofer Date: Mon, 19 Feb 2024 15:08:15 +0100 Subject: [PATCH] sort and fmt --- Cargo.toml | 8 ++++---- balances-tx-payment/Cargo.toml | 2 -- balances-tx-payment/rpc/Cargo.toml | 2 +- .../rpc/runtime-api/Cargo.toml | 4 ++-- balances/Cargo.toml | 6 ++---- bazaar/Cargo.toml | 10 ++++------ bazaar/rpc/Cargo.toml | 2 +- ceremonies/Cargo.toml | 18 ++++++++--------- ceremonies/meetup-validation/Cargo.toml | 2 +- ceremonies/rpc/Cargo.toml | 2 +- communities/Cargo.toml | 14 +++++-------- democracy/Cargo.toml | 20 +++++++++---------- faucet/Cargo.toml | 2 +- primitives/Cargo.toml | 4 ++-- primitives/core/Cargo.toml | 4 ++-- reputation-commitments/Cargo.toml | 20 +++++++++---------- scheduler/Cargo.toml | 5 ++--- test-utils/Cargo.toml | 6 +++--- vouches/Cargo.toml | 7 ++----- 19 files changed, 61 insertions(+), 77 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2f2fa54d..b4ae26d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,8 +28,8 @@ members = [ [workspace.dependencies] # local pin -encointer-meetup-validation = { path = "ceremonies/meetup-validation", default-features = false, version = "3.0.2" } encointer-ceremonies-assignment = { path = "ceremonies/assignment", default-features = false, version = "3.0.2" } +encointer-meetup-validation = { path = "ceremonies/meetup-validation", default-features = false, version = "3.0.2" } encointer-primitives = { path = "primitives", default-features = false, features = ["serde_derive"], version = "3.0.2" } encointer-rpc = { path = "rpc", version = "3.0.2" } ep-core = { path = "primitives/core", default-features = false, version = "3.0.2" } @@ -48,16 +48,16 @@ pallet-encointer-communities-rpc-runtime-api = { path = "communities/rpc/runtime # various array-bytes = "6.1.0" bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] } -parity-scale-codec = { version = "3.6.4", default-features = false, features = [ "derive", "max-encoded-len"] } crc = "2.1.0" fixed = { package = "substrate-fixed", default-features = false, version = "0.5.9" } geohash = { package = "substrate-geohash", version = "0.13.0" } impl-serde = { version = "0.4.0", default-features = false } impl-trait-for-tuples = { version = "0.2.2", default-features = false } log = { version = "0.4.20", default-features = false } +parity-scale-codec = { version = "3.6.4", default-features = false, features = ["derive", "max-encoded-len"] } parking_lot = "0.12.0" scale-info = { version = "2.10.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.188", default-features = false, features = [ "derive", "alloc" ] } +serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] } thiserror = "1.0.31" # polkadot-sdk [no_std] @@ -78,7 +78,7 @@ sp-runtime = { default-features = false, version = "28.0.0" } sp-std = { default-features = false, version = "12.0.0" } # rpc stuff [std] -jsonrpsee = { version = "0.16.3", features = ["client-core", "server", "macros" ] } +jsonrpsee = { version = "0.16.3", features = ["client-core", "server", "macros"] } jsonrpsee-core = { version = "0.16.3" } jsonrpsee-types = { version = "0.16.3" } pallet-transaction-payment-rpc = { version = "27.0.0" } diff --git a/balances-tx-payment/Cargo.toml b/balances-tx-payment/Cargo.toml index eef10b14..bd4dbc97 100644 --- a/balances-tx-payment/Cargo.toml +++ b/balances-tx-payment/Cargo.toml @@ -33,12 +33,10 @@ test-utils = { workspace = true } default = ["std"] std = [ "encointer-primitives/std", - # substrate deps "frame-support/std", "frame-system/std", "log/std", "pallet-asset-tx-payment/std", - # encointer deps "pallet-encointer-balances/std", "pallet-encointer-ceremonies/std", "pallet-transaction-payment/std", diff --git a/balances-tx-payment/rpc/Cargo.toml b/balances-tx-payment/rpc/Cargo.toml index 00229ce0..fe83fdc1 100644 --- a/balances-tx-payment/rpc/Cargo.toml +++ b/balances-tx-payment/rpc/Cargo.toml @@ -9,9 +9,9 @@ repository = "https://github.com/encointer/pallets" license = "GPL-3.0-or-later" [dependencies] -parity-scale-codec = { workspace = true } jsonrpsee = { workspace = true } log = { workspace = true, features = ["std"] } +parity-scale-codec = { workspace = true } parking_lot = { workspace = true } thiserror = { workspace = true } diff --git a/balances-tx-payment/rpc/runtime-api/Cargo.toml b/balances-tx-payment/rpc/runtime-api/Cargo.toml index cad9a7f0..b3ec4754 100644 --- a/balances-tx-payment/rpc/runtime-api/Cargo.toml +++ b/balances-tx-payment/rpc/runtime-api/Cargo.toml @@ -13,8 +13,8 @@ license = "GPL-3.0-or-later" encointer-primitives = { workspace = true } # substrate deps -parity-scale-codec = { workspace = true } frame-support = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } sp-api = { workspace = true } sp-std = { workspace = true } @@ -22,9 +22,9 @@ sp-std = { workspace = true } [features] default = ["std"] std = [ - "parity-scale-codec/std", "encointer-primitives/std", "frame-support/std", + "parity-scale-codec/std", "scale-info/std", "sp-api/std", "sp-std/std", diff --git a/balances/Cargo.toml b/balances/Cargo.toml index 3818f381..a8235516 100644 --- a/balances/Cargo.toml +++ b/balances/Cargo.toml @@ -10,8 +10,8 @@ license = "GPL-3.0-or-later" [dependencies] approx = { workspace = true, optional = true } -parity-scale-codec = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # local deps @@ -34,15 +34,13 @@ test-utils = { workspace = true } [features] default = ["std"] std = [ - "parity-scale-codec/std", - # local deps "encointer-primitives/std", - # substrate deps "frame-support/std", "frame-system/std", "log/std", "pallet-asset-tx-payment/std", "pallet-transaction-payment/std", + "parity-scale-codec/std", "scale-info/std", "sp-runtime/std", "sp-std/std", diff --git a/bazaar/Cargo.toml b/bazaar/Cargo.toml index 9ff30ff4..e20e377c 100644 --- a/bazaar/Cargo.toml +++ b/bazaar/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/encointer/pallets" license = "GPL-3.0-or-later" [dependencies] -parity-scale-codec = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # local deps @@ -31,14 +31,12 @@ test-utils = { workspace = true } [features] default = ["std"] std = [ - "parity-scale-codec/std", - # local deps - "pallet-encointer-communities/std", "encointer-primitives/std", - # substrate deps "frame-support/std", "frame-system/std", "log/std", + "pallet-encointer-communities/std", + "parity-scale-codec/std", "scale-info/std", "sp-core/std", "sp-std/std", @@ -52,6 +50,6 @@ runtime-benchmarks = [ ] try-runtime = [ - "pallet-encointer-communities/try-runtime", "frame-system/try-runtime", + "pallet-encointer-communities/try-runtime", ] diff --git a/bazaar/rpc/Cargo.toml b/bazaar/rpc/Cargo.toml index 2d804522..ca50ca98 100644 --- a/bazaar/rpc/Cargo.toml +++ b/bazaar/rpc/Cargo.toml @@ -15,9 +15,9 @@ parking_lot = { workspace = true } thiserror = { workspace = true } # local deps -pallet-encointer-bazaar-rpc-runtime-api = { workspace = true } encointer-primitives = { workspace = true } encointer-rpc = { workspace = true } +pallet-encointer-bazaar-rpc-runtime-api = { workspace = true } # substrate deps sc-rpc = { workspace = true } diff --git a/ceremonies/Cargo.toml b/ceremonies/Cargo.toml index 14be2b54..c017bd77 100644 --- a/ceremonies/Cargo.toml +++ b/ceremonies/Cargo.toml @@ -9,13 +9,13 @@ repository = "https://github.com/encointer/pallets" license = "GPL-3.0-or-later" [dependencies] -parity-scale-codec = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # local deps encointer-ceremonies-assignment = { workspace = true } -encointer-meetup-validation = { workspace = true } +encointer-meetup-validation = { workspace = true } encointer-primitives = { workspace = true } pallet-encointer-balances = { workspace = true } pallet-encointer-communities = { workspace = true } @@ -45,18 +45,18 @@ test-utils = { workspace = true } [features] default = ["std"] std = [ - "parity-scale-codec/std", - "pallet-encointer-balances/std", "encointer-ceremonies-assignment/std", - "pallet-encointer-communities/std", "encointer-meetup-validation/std", "encointer-primitives/std", - "pallet-encointer-scheduler/std", "frame-benchmarking/std", "frame-support/std", "frame-system/std", "log/std", + "pallet-encointer-balances/std", + "pallet-encointer-communities/std", + "pallet-encointer-scheduler/std", "pallet-timestamp/std", + "parity-scale-codec/std", "scale-info/std", "sp-core/std", "sp-io/std", @@ -65,12 +65,12 @@ std = [ ] runtime-benchmarks = [ - "pallet-encointer-balances/runtime-benchmarks", - "pallet-encointer-communities/runtime-benchmarks", - "pallet-encointer-scheduler/runtime-benchmarks", "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-encointer-balances/runtime-benchmarks", + "pallet-encointer-communities/runtime-benchmarks", + "pallet-encointer-scheduler/runtime-benchmarks", "sp-application-crypto", ] diff --git a/ceremonies/meetup-validation/Cargo.toml b/ceremonies/meetup-validation/Cargo.toml index 5aff11a5..e35e52d7 100644 --- a/ceremonies/meetup-validation/Cargo.toml +++ b/ceremonies/meetup-validation/Cargo.toml @@ -27,8 +27,8 @@ sp-core = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ - "parity-scale-codec/std", "encointer-primitives/std", + "parity-scale-codec/std", "scale-info/std", "serde/std", "sp-runtime/std", diff --git a/ceremonies/rpc/Cargo.toml b/ceremonies/rpc/Cargo.toml index 80db3d43..ded6023e 100644 --- a/ceremonies/rpc/Cargo.toml +++ b/ceremonies/rpc/Cargo.toml @@ -15,9 +15,9 @@ parking_lot = { workspace = true } thiserror = { workspace = true } # local deps -pallet-encointer-ceremonies-rpc-runtime-api = { workspace = true } encointer-primitives = { workspace = true } encointer-rpc = { workspace = true } +pallet-encointer-ceremonies-rpc-runtime-api = { workspace = true } # substrate deps sc-rpc = { workspace = true } diff --git a/communities/Cargo.toml b/communities/Cargo.toml index 28abfbfc..17ce4557 100644 --- a/communities/Cargo.toml +++ b/communities/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/encointer/pallets" license = "GPL-3.0-or-later" [dependencies] -parity-scale-codec = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # local deps @@ -34,15 +34,13 @@ test-utils = { workspace = true } [features] default = ["std"] std = [ - "parity-scale-codec/std", - "pallet-encointer-balances/std", - # local deps "encointer-primitives/std", - "pallet-encointer-scheduler/std", - # substrate deps "frame-support/std", "frame-system/std", "log/std", + "pallet-encointer-balances/std", + "pallet-encointer-scheduler/std", + "parity-scale-codec/std", "scale-info/std", "sp-io/std", "sp-runtime/std", @@ -54,11 +52,9 @@ runtime-benchmarks = [ "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - ] try-runtime = [ + "frame-system/try-runtime", "pallet-encointer-balances/try-runtime", "pallet-encointer-scheduler/try-runtime", - "frame-system/try-runtime", - ] diff --git a/democracy/Cargo.toml b/democracy/Cargo.toml index 7d80a6b3..d1ad935a 100644 --- a/democracy/Cargo.toml +++ b/democracy/Cargo.toml @@ -10,8 +10,8 @@ license = "GPL-3.0-or-later" publish = false [dependencies] -parity-scale-codec = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # local deps @@ -46,37 +46,37 @@ test-utils = { workspace = true } [features] default = ["std"] std = [ - "parity-scale-codec/std", - "pallet-encointer-balances/std", - "pallet-encointer-ceremonies/std", - "pallet-encointer-communities/std", "encointer-primitives/std", - "pallet-encointer-scheduler/std", "frame-benchmarking/std", "frame-support/std", "frame-system/std", "log/std", + "pallet-encointer-balances/std", + "pallet-encointer-ceremonies/std", + "pallet-encointer-communities/std", + "pallet-encointer-scheduler/std", "pallet-timestamp/std", + "parity-scale-codec/std", "scale-info/std", "sp-core/std", "sp-io/std", "sp-std/std", ] runtime-benchmarks = [ + "frame-benchmarking", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", "pallet-encointer-balances/runtime-benchmarks", "pallet-encointer-ceremonies/runtime-benchmarks", "pallet-encointer-communities/runtime-benchmarks", "pallet-encointer-scheduler/runtime-benchmarks", - "frame-benchmarking", - "frame-support/runtime-benchmarks", - "frame-system/runtime-benchmarks", "sp-application-crypto", "sp-core", ] try-runtime = [ + "frame-system/try-runtime", "pallet-encointer-balances/try-runtime", "pallet-encointer-ceremonies/try-runtime", "pallet-encointer-communities/try-runtime", "pallet-encointer-scheduler/try-runtime", - "frame-system/try-runtime", ] diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml index 9c1f3719..e5565d51 100644 --- a/faucet/Cargo.toml +++ b/faucet/Cargo.toml @@ -10,8 +10,8 @@ license = "GPL-3.0-or-later" [dependencies] approx = { workspace = true, optional = true } -parity-scale-codec = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # local deps diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 43799d17..4255a9fc 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -10,10 +10,10 @@ license = "GPL-3.0-or-later" [dependencies] bs58 = { workspace = true } -parity-scale-codec = { workspace = true } crc = { workspace = true } geohash = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } serde = { workspace = true, optional = true } @@ -39,9 +39,9 @@ full_crypto = ["sp-core/full_crypto"] serde_derive = ["ep-core/serde_derive", "serde"] std = [ "bs58/std", - "parity-scale-codec/std", "ep-core/std", "frame-support/std", + "parity-scale-codec/std", "scale-info/std", "serde/std", "sp-core/full_crypto", diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index 686454db..4cf32edf 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -10,9 +10,9 @@ license = "GPL-3.0-or-later" [dependencies] array-bytes = { workspace = true } -parity-scale-codec = { workspace = true } fixed = { workspace = true } impl-serde = { workspace = true, optional = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } serde = { workspace = true, optional = true } @@ -28,9 +28,9 @@ serde_json = { workspace = true } default = ["serde_derive", "std"] serde_derive = ["fixed/serde", "impl-serde", "serde"] std = [ - "parity-scale-codec/std", "fixed/std", "impl-serde/std", + "parity-scale-codec/std", "scale-info/std", "serde/std", "sp-arithmetic/std", diff --git a/reputation-commitments/Cargo.toml b/reputation-commitments/Cargo.toml index 976f96af..7526b84b 100644 --- a/reputation-commitments/Cargo.toml +++ b/reputation-commitments/Cargo.toml @@ -10,8 +10,8 @@ license = "GPL-3.0-or-later" [dependencies] approx = { workspace = true, optional = true } -parity-scale-codec = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # local deps @@ -38,16 +38,14 @@ test-utils = { workspace = true } default = ["std"] std = [ "approx/std", - "parity-scale-codec/std", - "pallet-encointer-ceremonies/std", - "pallet-encointer-communities/std", - # local deps "encointer-primitives/std", - "pallet-encointer-scheduler/std", - # substrate deps "frame-support/std", "frame-system/std", "log/std", + "pallet-encointer-ceremonies/std", + "pallet-encointer-communities/std", + "pallet-encointer-scheduler/std", + "parity-scale-codec/std", "scale-info/std", "sp-core/std", "sp-runtime/std", @@ -55,16 +53,16 @@ std = [ ] runtime-benchmarks = [ "approx", - "pallet-encointer-ceremonies/runtime-benchmarks", - "pallet-encointer-communities/runtime-benchmarks", - "pallet-encointer-scheduler/runtime-benchmarks", "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "pallet-encointer-ceremonies/runtime-benchmarks", + "pallet-encointer-communities/runtime-benchmarks", + "pallet-encointer-scheduler/runtime-benchmarks", ] try-runtime = [ + "frame-system/try-runtime", "pallet-encointer-ceremonies/try-runtime", "pallet-encointer-communities/try-runtime", "pallet-encointer-scheduler/try-runtime", - "frame-system/try-runtime", ] diff --git a/scheduler/Cargo.toml b/scheduler/Cargo.toml index 7515d0bb..d548a084 100644 --- a/scheduler/Cargo.toml +++ b/scheduler/Cargo.toml @@ -9,9 +9,9 @@ repository = "https://github.com/encointer/pallets" license = "GPL-3.0-or-later" [dependencies] -parity-scale-codec = { workspace = true } impl-trait-for-tuples = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # local deps @@ -32,12 +32,12 @@ test-utils = { workspace = true } [features] default = ["std"] std = [ - "parity-scale-codec/std", "encointer-primitives/std", "frame-support/std", "frame-system/std", "log/std", "pallet-timestamp/std", + "parity-scale-codec/std", "scale-info/std", "sp-runtime/std", "sp-std/std", @@ -46,6 +46,5 @@ runtime-benchmarks = [ "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - ] try-runtime = ["frame-system/try-runtime"] diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index 89ae84ae..1e53c4d7 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -10,8 +10,8 @@ license = "GPL-3.0-or-later" publish = false [dependencies] -parity-scale-codec = { workspace = true } log = { workspace = true, features = ["std"] } +parity-scale-codec = { workspace = true } # local deps encointer-primitives = { workspace = true, features = ["std"] } @@ -35,12 +35,12 @@ sp-std = { workspace = true, features = ["std"] } [features] runtime-benchmarks = [ + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", "pallet-encointer-balances/runtime-benchmarks", "pallet-encointer-ceremonies/runtime-benchmarks", "pallet-encointer-communities/runtime-benchmarks", "pallet-encointer-scheduler/runtime-benchmarks", - "frame-support/runtime-benchmarks", - "frame-system/runtime-benchmarks", ] try-runtime = [ "pallet-encointer-balances/try-runtime", diff --git a/vouches/Cargo.toml b/vouches/Cargo.toml index 0760ca00..c32c1f67 100644 --- a/vouches/Cargo.toml +++ b/vouches/Cargo.toml @@ -11,8 +11,8 @@ publish = false [dependencies] approx = { workspace = true, optional = true } -parity-scale-codec = { workspace = true } log = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # local deps @@ -36,14 +36,12 @@ test-utils = { workspace = true } default = ["std"] std = [ "approx/std", - "parity-scale-codec/std", - # local deps "encointer-primitives/std", - # substrate deps "frame-benchmarking/std", "frame-support/std", "frame-system/std", "log/std", + "parity-scale-codec/std", "scale-info/std", "sp-core/std", "sp-runtime/std", @@ -54,6 +52,5 @@ runtime-benchmarks = [ "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - ] try-runtime = ["frame-system/try-runtime"]