update to stable2407 (#1007)

* update to stable2407 * update tarpaulin version * fix tarpaulin * fix * fix
open-web3-stack · Aug 1, 2024 · 674426b · 674426b
1 parent 23c8363
commit 674426b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 34 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -14,7 +14,7 @@ on:
       - '**/README.md'
 
 env:
-  TARPAULIN_VERSION: 0.19.1
+  TARPAULIN_VERSION: 0.31.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -33,8 +33,8 @@ jobs:
         uses: dtolnay/rust-toolchain@nightly
       - name: Generate code coverage
         run: |
-          wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz
-          tar -zxvf cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz -C $HOME/.cargo/bin
+          wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz
+          tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
           make Cargo.toml
           cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml
       - name: Upload to codecov.io

diff --git a/Cargo.dev.toml b/Cargo.dev.toml
@@ -37,35 +37,35 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 serde = { version = "1.0.189" }
 parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] }
 
-cumulus-pallet-xcm = { version = "0.14.0", default-features = false }
-cumulus-primitives-core = { version = "0.14.0", default-features = false }
-frame-benchmarking = { version = "35.0.0", default-features = false }
-frame-support = { version = "35.0.0", default-features = false }
-frame-system = { version = "35.0.0", default-features = false }
-pallet-balances = { version = "36.0.0", default-features = false }
-pallet-elections-phragmen = { version = "36.0.0", default-features = false }
-pallet-message-queue = { version = "38.0.0", default-features = false }
-pallet-preimage = { version = "35.0.0", default-features = false }
-pallet-root-testing = { version = "11.0.0", default-features = false }
-pallet-scheduler = { version = "36.0.0", default-features = false }
-pallet-timestamp = { version = "34.0.0", default-features = false }
-pallet-treasury = { version = "34.0.0", default-features = false }
-pallet-xcm = { version = "14.0.0", default-features = false }
-polkadot-parachain-primitives = { version = "13.0.0", default-features = false }
-polkadot-runtime-common = { version = "14.0.0", default-features = false }
-polkadot-runtime-parachains = { version = "14.0.0", default-features = false }
-sp-api = { version = "33.0.0", default-features = false }
-sp-application-crypto = { version = "37.0.0", default-features = false }
+cumulus-pallet-xcm = { version = "0.16.0", default-features = false }
+cumulus-primitives-core = { version = "0.15.0", default-features = false }
+frame-benchmarking = { version = "37.0.0", default-features = false }
+frame-support = { version = "37.0.0", default-features = false }
+frame-system = { version = "37.0.0", default-features = false }
+pallet-balances = { version = "38.0.0", default-features = false }
+pallet-elections-phragmen = { version = "38.0.0", default-features = false }
+pallet-message-queue = { version = "40.0.0", default-features = false }
+pallet-preimage = { version = "37.0.0", default-features = false }
+pallet-root-testing = { version = "13.0.0", default-features = false }
+pallet-scheduler = { version = "38.0.0", default-features = false }
+pallet-timestamp = { version = "36.0.0", default-features = false }
+pallet-treasury = { version = "36.0.0", default-features = false }
+pallet-xcm = { version = "16.0.0", default-features = false }
+polkadot-parachain-primitives = { version = "14.0.0", default-features = false }
+polkadot-runtime-common = { version = "16.0.0", default-features = false }
+polkadot-runtime-parachains = { version = "16.0.0", default-features = false }
+sp-api = { version = "34.0.0", default-features = false }
+sp-application-crypto = { version = "38.0.0", default-features = false }
 sp-arithmetic = { version = "26.0.0", default-features = false }
 sp-core = { version = "34.0.0", default-features = false }
-sp-io = { version = "37.0.0", default-features = false }
-sp-runtime = { version = "38.0.0", default-features = false }
+sp-io = { version = "38.0.0", default-features = false }
+sp-runtime = { version = "39.0.0", default-features = false }
 sp-runtime-interface = { version = "28.0.0", default-features = false }
-sp-staking = { version = "33.0.0", default-features = false }
+sp-staking = { version = "34.0.0", default-features = false }
 sp-std = { version = "14.0.0", default-features = false }
 sp-storage = { version = "21.0.0", default-features = false }
-xcm = { version = "14.0.0", package = "staging-xcm", default-features = false }
-xcm-builder = { version = "14.0.0", package = "staging-xcm-builder", default-features = false }
-xcm-executor = { version = "14.0.0", package = "staging-xcm-executor", default-features = false }
+xcm = { version = "14.1.0", package = "staging-xcm", default-features = false }
+xcm-builder = { version = "16.0.0", package = "staging-xcm-builder", default-features = false }
+xcm-executor = { version = "16.0.0", package = "staging-xcm-executor", default-features = false }
 
-xcm-simulator = { version = "14.0.0" }
+xcm-simulator = { version = "16.0.0" }
diff --git a/benchmarking/src/lib.rs b/benchmarking/src/lib.rs
@@ -11,6 +11,8 @@ pub use frame_benchmarking::{
 	Recording,
 };
 
+#[cfg(not(feature = "std"))]
+extern crate alloc;
 #[cfg(feature = "std")]
 pub use frame_benchmarking::{Analysis, BenchmarkSelector};
 #[doc(hidden)]

diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs
@@ -92,13 +92,8 @@ pub type MockCurrencyAdapter = CurrencyAdapter<Runtime, GetTokenId>;
 impl pallet_treasury::Config for Runtime {
 	type PalletId = TreasuryPalletId;
 	type Currency = MockCurrencyAdapter;
-	type ApproveOrigin = frame_system::EnsureRoot<AccountId>;
 	type RejectOrigin = frame_system::EnsureRoot<AccountId>;
 	type RuntimeEvent = RuntimeEvent;
-	type OnSlash = ();
-	type ProposalBond = ProposalBond;
-	type ProposalBondMinimum = ConstU64<1>;
-	type ProposalBondMaximum = ();
 	type SpendPeriod = ConstU64<2>;
 	type Burn = Burn;
 	type BurnDestination = (); // Just gets burned.