make it work with taplo

AstarNetwork · Jun 23, 2024 · ac509e1 · ac509e1
1 parent c42b491
commit ac509e1
Show file tree

Hide file tree

Showing 47 changed files with 99 additions and 56 deletions.
diff --git a/.config/zepter.yaml b/.config/zepter.yaml
@@ -33,12 +33,9 @@ workflows:
         '--locked',
         '--quiet',
       ]
-      # Format the features into canonical format:
-    - ['format', 'features', '--offline', '--locked', '--quiet']
   # Same as `check`, but actually fix the issues instead of just reporting them:
   default:
     - [ $check.0, '--fix' ]
-    - [ $check.1, '--fix' ]
 
 # Will be displayed when any workflow fails:
 help:

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -24,6 +24,15 @@ jobs:
       - name: Check fmt
         run: cargo fmt -- --check
 
+      - name: Check Cargo.toml format
+        run: |
+          if taplo --version &> /dev/null; then
+            echo "taplo-cli is already installed"
+          else
+            cargo install taplo-cli
+          fi
+          taplo fmt --check
+
   clippy:
     if: github.event.pull_request.draft == false
     runs-on: [self-hosted, Linux, X64]

diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -154,7 +154,7 @@ sc-service = { workspace = true, optional = true }
 substrate-build-script-utils = { workspace = true }
 
 [features]
-default = [ "polkadot-cli", "sc-cli", "sc-service", "sc-service/rocksdb" ]
+default = ["polkadot-cli", "sc-cli", "sc-service", "sc-service/rocksdb"]
 runtime-benchmarks = [
 	"astar-primitives/runtime-benchmarks",
 	"astar-runtime/runtime-benchmarks",
@@ -179,7 +179,7 @@ runtime-benchmarks = [
 	"sp-keyring",
 	"sp-runtime/runtime-benchmarks",
 ]
-cli = [ "try-runtime-cli" ]
+cli = ["try-runtime-cli"]
 try-runtime = [
 	"astar-primitives/try-runtime",
 	"astar-runtime/try-runtime",
@@ -208,4 +208,4 @@ evm-tracing = [
 	"shibuya-runtime/evm-tracing",
 	"shiden-runtime/evm-tracing",
 ]
-manual-seal = [ "sc-consensus-manual-seal" ]
+manual-seal = ["sc-consensus-manual-seal"]
diff --git a/chain-extensions/pallet-assets/Cargo.toml b/chain-extensions/pallet-assets/Cargo.toml
@@ -30,7 +30,7 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"assets-chain-extension-types/std",
 	"frame-support/std",

diff --git a/chain-extensions/types/assets/Cargo.toml b/chain-extensions/types/assets/Cargo.toml
@@ -15,7 +15,7 @@ scale-info = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"num_enum/std",
 	"parity-scale-codec/std",

diff --git a/chain-extensions/types/unified-accounts/Cargo.toml b/chain-extensions/types/unified-accounts/Cargo.toml
@@ -17,7 +17,7 @@ sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"num_enum/std",
 	"parity-scale-codec/std",

diff --git a/chain-extensions/types/xvm/Cargo.toml b/chain-extensions/types/xvm/Cargo.toml
@@ -16,7 +16,7 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"parity-scale-codec/std",

diff --git a/chain-extensions/unified-accounts/Cargo.toml b/chain-extensions/unified-accounts/Cargo.toml
@@ -27,7 +27,7 @@ pallet-unified-accounts = { workspace = true }
 unified-accounts-chain-extension-types = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	# Astar
 	"astar-primitives/std",

diff --git a/chain-extensions/xvm/Cargo.toml b/chain-extensions/xvm/Cargo.toml
@@ -27,7 +27,7 @@ astar-primitives = { workspace = true }
 xvm-chain-extension-types = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	# Astar
 	"astar-primitives/std",

diff --git a/pallets/astar-xcm-benchmarks/Cargo.toml b/pallets/astar-xcm-benchmarks/Cargo.toml
@@ -17,7 +17,7 @@ serde = { workspace = true, optional = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 parity-scale-codec = { workspace = true, optional = true, features = [
-    "derive",
+	"derive",
 ] }
 scale-info = { workspace = true }
 sp-runtime = { workspace = true }
@@ -42,7 +42,7 @@ sp-io = { workspace = true, features = ["std"] }
 xcm-builder = { workspace = true, features = ["std"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking/std",

diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
@@ -39,7 +39,7 @@ sp-io = { workspace = true }
 sp-tracing = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-benchmarking/runtime-benchmarks",

diff --git a/pallets/dapp-staking-migration/Cargo.toml b/pallets/dapp-staking-migration/Cargo.toml
@@ -28,7 +28,7 @@ sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking/std",

diff --git a/pallets/dapp-staking-v3/Cargo.toml b/pallets/dapp-staking-v3/Cargo.toml
@@ -31,7 +31,7 @@ frame-benchmarking = { workspace = true, optional = true }
 pallet-balances = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking/std",

diff --git a/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml b/pallets/dapp-staking-v3/rpc/runtime-api/Cargo.toml
@@ -17,5 +17,5 @@ sp-std = { workspace = true }
 astar-primitives = { workspace = true }
 
 [features]
-default = [ "std" ]
-std = [ "astar-primitives/std", "sp-api/std", "sp-std/std" ]
+default = ["std"]
+std = ["astar-primitives/std", "sp-api/std", "sp-std/std"]
diff --git a/pallets/dynamic-evm-base-fee/Cargo.toml b/pallets/dynamic-evm-base-fee/Cargo.toml
@@ -31,7 +31,7 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	# Frontier
 	"fp-evm/std",

diff --git a/pallets/ethereum-checked/Cargo.toml b/pallets/ethereum-checked/Cargo.toml
@@ -35,7 +35,7 @@ pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"ethereum-types/std",

diff --git a/pallets/inflation/Cargo.toml b/pallets/inflation/Cargo.toml
@@ -28,7 +28,7 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",

diff --git a/pallets/oracle-benchmarks/Cargo.toml b/pallets/oracle-benchmarks/Cargo.toml
@@ -28,7 +28,7 @@ astar-primitives = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",

diff --git a/pallets/price-aggregator/Cargo.toml b/pallets/price-aggregator/Cargo.toml
@@ -32,7 +32,7 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",

diff --git a/pallets/static-price-provider/Cargo.toml b/pallets/static-price-provider/Cargo.toml
@@ -29,7 +29,7 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",

diff --git a/pallets/unified-accounts/Cargo.toml b/pallets/unified-accounts/Cargo.toml
@@ -42,7 +42,7 @@ pallet-evm = { workspace = true }
 pallet-timestamp = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"frame-benchmarking?/std",

diff --git a/pallets/xc-asset-config/Cargo.toml b/pallets/xc-asset-config/Cargo.toml
@@ -31,7 +31,7 @@ pallet-timestamp = { workspace = true }
 sp-core = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"frame-benchmarking?/std",
 	"frame-support/std",

diff --git a/pallets/xvm/Cargo.toml b/pallets/xvm/Cargo.toml
@@ -42,7 +42,7 @@ pallet-timestamp = { workspace = true, features = ["std"] }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"environmental/std",

diff --git a/precompiles/assets-erc20/Cargo.toml b/precompiles/assets-erc20/Cargo.toml
@@ -40,7 +40,7 @@ pallet-timestamp = { workspace = true }
 scale-info = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"fp-evm/std",
 	"frame-support/std",

diff --git a/precompiles/dapp-staking-v3/Cargo.toml b/precompiles/dapp-staking-v3/Cargo.toml
@@ -42,7 +42,7 @@ sp-arithmetic = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",

diff --git a/precompiles/dispatch-lockdrop/Cargo.toml b/precompiles/dispatch-lockdrop/Cargo.toml
@@ -38,7 +38,7 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",

diff --git a/precompiles/sr25519/Cargo.toml b/precompiles/sr25519/Cargo.toml
@@ -37,7 +37,7 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"fp-evm/std",
 	"log/std",

diff --git a/precompiles/substrate-ecdsa/Cargo.toml b/precompiles/substrate-ecdsa/Cargo.toml
@@ -38,7 +38,7 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"fp-evm/std",
 	"log/std",

diff --git a/precompiles/unified-accounts/Cargo.toml b/precompiles/unified-accounts/Cargo.toml
@@ -45,7 +45,7 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",

diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml
@@ -42,7 +42,7 @@ hex-literal = { workspace = true }
 xcm = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"environmental/std",
 	"evm/std",
@@ -62,7 +62,7 @@ std = [
 	"sp-std/std",
 	"xcm?/std",
 ]
-codec-xcm = [ "xcm" ]
+codec-xcm = ["xcm"]
 testing = [
 	"derive_more",
 	"hex-literal",

diff --git a/precompiles/utils/macro/Cargo.toml b/precompiles/utils/macro/Cargo.toml
@@ -33,7 +33,7 @@ sp-core-hashing = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"fp-evm/std",
 	"frame-support/std",

diff --git a/precompiles/xcm/Cargo.toml b/precompiles/xcm/Cargo.toml
@@ -50,7 +50,7 @@ pallet-timestamp = { workspace = true }
 xcm-builder = { workspace = true, features = ["std"] }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",

diff --git a/precompiles/xvm/Cargo.toml b/precompiles/xvm/Cargo.toml
@@ -42,7 +42,7 @@ pallet-timestamp = { workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"fp-evm/std",

diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -48,7 +48,7 @@ pallet-evm-precompile-dispatch = { workspace = true }
 pallet-xc-asset-config = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"ethereum-types/std",
 	"ethereum/std",

diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
@@ -136,7 +136,7 @@ pallet-chain-extension-assets = { workspace = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"astar-xcm-benchmarks?/std",

diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
@@ -105,7 +105,7 @@ frame-try-runtime = { workspace = true, optional = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"dapp-staking-v3-runtime-api/std",

diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
@@ -147,7 +147,7 @@ frame-try-runtime = { workspace = true, optional = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"astar-xcm-benchmarks?/std",

diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
@@ -139,7 +139,7 @@ pallet-chain-extension-assets = { workspace = true }
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
 	"astar-primitives/std",
 	"astar-xcm-benchmarks?/std",