2190 (#2567)

xlc · web-flow · commit 0c1a87297006 · 2023-07-05T12:04:46.000+12:00
* 2190

* use nightly fmt
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/githooks/pre-commit b/githooks/pre-commit
@@ -6,7 +6,7 @@ REPO_ROOT_DIR="$(git rev-parse --show-toplevel)"
 
 files=$((git diff --cached --name-only --diff-filter=ACMR | grep -Ei "\.rs$") || true)
 if [ ! -z "${files}" ]; then
-    cargo fmt --all
+    cargo +nightly fmt --all
     git add $(echo "$files" | paste -s -d " " -)
 fi
 
diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala-inspect"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/aggregated-dex/Cargo.toml b/modules/aggregated-dex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-aggregated-dex"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-asset-registry"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-auction-manager"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-cdp-engine"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-cdp-treasury"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'module-collator-selection'
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-currencies"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/dex-oracle/Cargo.toml b/modules/dex-oracle/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-dex-oracle"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-dex"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/earning/Cargo.toml b/modules/earning/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-earning"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-emergency-shutdown"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-accounts"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/evm-bridge/Cargo.toml b/modules/evm-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-bridge"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-utility"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/evm-utility/macro/Cargo.toml b/modules/evm-utility/macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-utility-macro"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-evm-rpc-runtime-api"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-homa-validator-list"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-homa"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/honzon-bridge/Cargo.toml b/modules/honzon-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-honzon-bridge"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-honzon"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-idle-scheduler"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/incentives/Cargo.toml b/modules/incentives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-incentives"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-loans"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/nft/Cargo.toml b/modules/nft/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-nft"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/nominees-election/Cargo.toml b/modules/nominees-election/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-nominees-election"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-prices"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/relaychain/Cargo.toml b/modules/relaychain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-relaychain"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/session-manager/Cargo.toml b/modules/session-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-session-manager"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-support"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/transaction-pause/Cargo.toml b/modules/transaction-pause/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-transaction-pause"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-transaction-payment"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/modules/transaction-payment/src/tests.rs b/modules/transaction-payment/src/tests.rs
@@ -872,8 +872,9 @@ fn charges_fee_when_validate_with_fee_currency_call_use_pool() {
 			50
 		));
 		assert_eq!(sub_dot_aca - fee_amount, Currencies::free_balance(ACA, &dot_acc));
-		assert_eq!(sub_dot_dot + fee_amount / 10, Currencies::free_balance(DOT, &dot_acc)); // 1 DOT = 10
-		                                                                            // ACA
+		assert_eq!(sub_dot_dot + fee_amount / 10, Currencies::free_balance(DOT, &dot_acc));
+		// 1 DOT = 10
+		// ACA
 	});
 }
 
diff --git a/modules/xcm-interface/Cargo.toml b/modules/xcm-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "module-xcm-interface"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 default-run = "acala"
diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala-cli"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/node/e2e-tests/Cargo.toml b/node/e2e-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "e2e-tests"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/node/e2e-tests/test-service/Cargo.toml b/node/e2e-tests/test-service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test-service"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala-service"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala-primitives"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala-rpc"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acala-runtime"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 build = "build.rs"
diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs
@@ -124,7 +124,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("acala"),
 	impl_name: create_runtime_str!("acala"),
 	authoring_version: 1,
-	spec_version: 2180,
+	spec_version: 2190,
 	impl_version: 0,
 	#[cfg(not(feature = "disable-runtime-api"))]
 	apis: RUNTIME_API_VERSIONS,
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-common"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 
diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "karura-runtime"
-version = "2.18.0"
+version = "2.19.0"
 authors = ["Acala Developers"]
 edition = "2021"
 build = "build.rs"
diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs
@@ -129,7 +129,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("karura"),
 	impl_name: create_runtime_str!("karura"),
 	authoring_version: 1,
-	spec_version: 2180,
+	spec_version: 2190,
 	impl_version: 0,
 	#[cfg(not(feature = "disable-runtime-api"))]
 	apis: RUNTIME_API_VERSIONS,
diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml
diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -872,8 +872,9 @@ fn charges_fee_when_validate_with_fee_currency_call_use_pool() {`
`872`	`872`	`50`
`873`	`873`	`));`
`874`	`874`	`assert_eq!(sub_dot_aca - fee_amount, Currencies::free_balance(ACA, &dot_acc));`
`875`		`- assert_eq!(sub_dot_dot + fee_amount / 10, Currencies::free_balance(DOT, &dot_acc)); // 1 DOT = 10`
`876`		`- // ACA`
	`875`	`+ assert_eq!(sub_dot_dot + fee_amount / 10, Currencies::free_balance(DOT, &dot_acc));`
	`876`	`+ // 1 DOT = 10`
	`877`	`+ // ACA`
`877`	`878`	`});`
`878`	`879`	`}`
`879`	`880`