Skip to content

Commit 674426b

Browse files
xlcxlc
authored
update to stable2407 (#1007)
* update to stable2407 * update tarpaulin version * fix tarpaulin * fix * fix
1 parent 23c8363 commit 674426b

File tree

4 files changed

+31
-34
lines changed

4 files changed

+31
-34
lines changed

‎.github/workflows/coverage.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- '**/README.md'
1515

1616
env:
17-
TARPAULIN_VERSION: 0.19.1
17+
TARPAULIN_VERSION: 0.31.0
1818

1919
concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}
@@ -33,8 +33,8 @@ jobs:
3333
uses: dtolnay/rust-toolchain@nightly
3434
- name: Generate code coverage
3535
run: |
36-
wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz
37-
tar -zxvf cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz -C $HOME/.cargo/bin
36+
wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz
37+
tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
3838
make Cargo.toml
3939
cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml
4040
- name: Upload to codecov.io

‎Cargo.dev.toml

+26-26
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,35 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
3737
serde = { version = "1.0.189" }
3838
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] }
3939

40-
cumulus-pallet-xcm = { version = "0.14.0", default-features = false }
41-
cumulus-primitives-core = { version = "0.14.0", default-features = false }
42-
frame-benchmarking = { version = "35.0.0", default-features = false }
43-
frame-support = { version = "35.0.0", default-features = false }
44-
frame-system = { version = "35.0.0", default-features = false }
45-
pallet-balances = { version = "36.0.0", default-features = false }
46-
pallet-elections-phragmen = { version = "36.0.0", default-features = false }
47-
pallet-message-queue = { version = "38.0.0", default-features = false }
48-
pallet-preimage = { version = "35.0.0", default-features = false }
49-
pallet-root-testing = { version = "11.0.0", default-features = false }
50-
pallet-scheduler = { version = "36.0.0", default-features = false }
51-
pallet-timestamp = { version = "34.0.0", default-features = false }
52-
pallet-treasury = { version = "34.0.0", default-features = false }
53-
pallet-xcm = { version = "14.0.0", default-features = false }
54-
polkadot-parachain-primitives = { version = "13.0.0", default-features = false }
55-
polkadot-runtime-common = { version = "14.0.0", default-features = false }
56-
polkadot-runtime-parachains = { version = "14.0.0", default-features = false }
57-
sp-api = { version = "33.0.0", default-features = false }
58-
sp-application-crypto = { version = "37.0.0", default-features = false }
40+
cumulus-pallet-xcm = { version = "0.16.0", default-features = false }
41+
cumulus-primitives-core = { version = "0.15.0", default-features = false }
42+
frame-benchmarking = { version = "37.0.0", default-features = false }
43+
frame-support = { version = "37.0.0", default-features = false }
44+
frame-system = { version = "37.0.0", default-features = false }
45+
pallet-balances = { version = "38.0.0", default-features = false }
46+
pallet-elections-phragmen = { version = "38.0.0", default-features = false }
47+
pallet-message-queue = { version = "40.0.0", default-features = false }
48+
pallet-preimage = { version = "37.0.0", default-features = false }
49+
pallet-root-testing = { version = "13.0.0", default-features = false }
50+
pallet-scheduler = { version = "38.0.0", default-features = false }
51+
pallet-timestamp = { version = "36.0.0", default-features = false }
52+
pallet-treasury = { version = "36.0.0", default-features = false }
53+
pallet-xcm = { version = "16.0.0", default-features = false }
54+
polkadot-parachain-primitives = { version = "14.0.0", default-features = false }
55+
polkadot-runtime-common = { version = "16.0.0", default-features = false }
56+
polkadot-runtime-parachains = { version = "16.0.0", default-features = false }
57+
sp-api = { version = "34.0.0", default-features = false }
58+
sp-application-crypto = { version = "38.0.0", default-features = false }
5959
sp-arithmetic = { version = "26.0.0", default-features = false }
6060
sp-core = { version = "34.0.0", default-features = false }
61-
sp-io = { version = "37.0.0", default-features = false }
62-
sp-runtime = { version = "38.0.0", default-features = false }
61+
sp-io = { version = "38.0.0", default-features = false }
62+
sp-runtime = { version = "39.0.0", default-features = false }
6363
sp-runtime-interface = { version = "28.0.0", default-features = false }
64-
sp-staking = { version = "33.0.0", default-features = false }
64+
sp-staking = { version = "34.0.0", default-features = false }
6565
sp-std = { version = "14.0.0", default-features = false }
6666
sp-storage = { version = "21.0.0", default-features = false }
67-
xcm = { version = "14.0.0", package = "staging-xcm", default-features = false }
68-
xcm-builder = { version = "14.0.0", package = "staging-xcm-builder", default-features = false }
69-
xcm-executor = { version = "14.0.0", package = "staging-xcm-executor", default-features = false }
67+
xcm = { version = "14.1.0", package = "staging-xcm", default-features = false }
68+
xcm-builder = { version = "16.0.0", package = "staging-xcm-builder", default-features = false }
69+
xcm-executor = { version = "16.0.0", package = "staging-xcm-executor", default-features = false }
7070

71-
xcm-simulator = { version = "14.0.0" }
71+
xcm-simulator = { version = "16.0.0" }

‎benchmarking/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ pub use frame_benchmarking::{
1111
Recording,
1212
};
1313

14+
#[cfg(not(feature = "std"))]
15+
extern crate alloc;
1416
#[cfg(feature = "std")]
1517
pub use frame_benchmarking::{Analysis, BenchmarkSelector};
1618
#[doc(hidden)]

‎tokens/src/mock.rs

-5
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,8 @@ pub type MockCurrencyAdapter = CurrencyAdapter<Runtime, GetTokenId>;
9292
impl pallet_treasury::Config for Runtime {
9393
type PalletId = TreasuryPalletId;
9494
type Currency = MockCurrencyAdapter;
95-
type ApproveOrigin = frame_system::EnsureRoot<AccountId>;
9695
type RejectOrigin = frame_system::EnsureRoot<AccountId>;
9796
type RuntimeEvent = RuntimeEvent;
98-
type OnSlash = ();
99-
type ProposalBond = ProposalBond;
100-
type ProposalBondMinimum = ConstU64<1>;
101-
type ProposalBondMaximum = ();
10297
type SpendPeriod = ConstU64<2>;
10398
type Burn = Burn;
10499
type BurnDestination = (); // Just gets burned.

0 commit comments

Comments
 (0)