depend-o-pocalipse (#9450)

Remove unneeded dependencies and dev-dependencies.
Made self_destruct test not dependent on wasm bin size.  
Updated code related to deprecated warning on tracing-subscriber `scope()` 
( See https://github.com/tokio-rs/tracing/issues/1429 )
This commit is contained in:
Squirrel
2021-08-13 15:18:37 +01:00
committed by GitHub
parent 76504e56d7
commit 7e9b8d278e
129 changed files with 487 additions and 726 deletions
+4 -5
View File
@@ -14,9 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
pallet-session = { version = "4.0.0-dev", default-features = false, path = "../session" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
sp-consensus-aura = { version = "0.10.0-dev", path = "../../primitives/consensus/aura", default-features = false }
@@ -25,9 +26,7 @@ pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "..
[dev-dependencies]
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
lazy_static = "1.4.0"
parking_lot = "0.11.1"
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
[features]
default = ["std"]
@@ -15,9 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
sp-authority-discovery = { version = "4.0.0-dev", default-features = false, path = "../../primitives/authority-discovery" }
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
pallet-session = { version = "4.0.0-dev", features = ["historical" ], path = "../session", default-features = false }
pallet-session = { version = "4.0.0-dev", features = [
"historical",
], path = "../session", default-features = false }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
@@ -25,7 +29,6 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
[dev-dependencies]
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
[features]
default = ["std"]
+4 -3
View File
@@ -13,7 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-authorship = { version = "4.0.0-dev", default-features = false, path = "../../primitives/authorship" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -23,8 +25,7 @@ impl-trait-for-tuples = "0.2.1"
[dev-dependencies]
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
serde = { version = "1.0.126" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
[features]
default = ["std"]
-1
View File
@@ -28,7 +28,6 @@ log = { version = "0.4.14", default-features = false }
[dev-dependencies]
hex-literal = "0.3.1"
serde = "1.0.126"
[features]
default = ["std"]
+4 -3
View File
@@ -13,7 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -23,9 +25,8 @@ pallet-treasury = { version = "4.0.0-dev", default-features = false, path = "../
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
[dev-dependencies]
sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
+3 -2
View File
@@ -13,7 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -25,7 +27,6 @@ log = { version = "0.4.14", default-features = false }
[dev-dependencies]
hex-literal = "0.3.1"
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
default = ["std"]
+7 -3
View File
@@ -14,11 +14,16 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
bitflags = "1.0"
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = [
"derive",
"max-encoded-len",
] }
log = { version = "0.4", default-features = false }
pwasm-utils = { version = "0.18", default-features = false }
serde = { version = "1", optional = true, features = ["derive"] }
smallvec = { version = "1", default-features = false, features = ["const_generics"] }
smallvec = { version = "1", default-features = false, features = [
"const_generics",
] }
wasmi-validation = { version = "0.4", default-features = false }
# Only used in benchmarking to generate random contract code
@@ -40,7 +45,6 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primit
[dev-dependencies]
assert_matches = "1"
hex-literal = "0.3"
paste = "1"
pretty_assertions = "0.7"
wat = "1"
+22 -4
View File
@@ -1644,10 +1644,28 @@ fn self_destruct_works() {
// The call triggers rent collection that reduces the amount of balance
// that remains for the beneficiary.
let balance_after_rent = 93_086;
let mut events = System::events();
let balance_after_rent = 99_000;
// The actual figure will bounce about with wasm compiler updates as the rent depends on
// the compiled wasm size, so we replace it with a fixed value
// as rent isn't what we're testing for in this test.
let mut actual_balance_after_rent = 99_000;
if let Event::Balances(pallet_balances::Event::Transfer(_, _, ref mut actual_bal)) =
&mut events[1].event
{
std::mem::swap(&mut actual_balance_after_rent, actual_bal);
assert!(
(90_000..99_000).contains(&actual_balance_after_rent),
"expected less than 100_000: {}",
actual_balance_after_rent
);
} else {
assert!(false);
}
pretty_assertions::assert_eq!(
System::events(),
events,
vec![
EventRecord {
phase: Phase::Initialization,
@@ -1673,7 +1691,7 @@ fn self_destruct_works() {
event: Event::Contracts(crate::Event::Terminated(addr.clone(), DJANGO)),
topics: vec![],
},
]
],
);
// Check that account is gone
@@ -1681,7 +1699,7 @@ fn self_destruct_works() {
// check that the beneficiary (django) got remaining balance
// some rent was deducted before termination
assert_eq!(Balances::free_balance(DJANGO), 1_000_000 + balance_after_rent);
assert_eq!(Balances::free_balance(DJANGO), 1_000_000 + actual_balance_after_rent);
});
}
+3 -4
View File
@@ -14,7 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
serde = { version = "1.0.126", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -26,9 +28,6 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
pallet-scheduler = { version = "4.0.0-dev", path = "../scheduler" }
sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
hex-literal = "0.3.1"
[features]
default = ["std"]
+3 -2
View File
@@ -1427,7 +1427,7 @@ impl<T: Config> Pallet<T> {
}
ReferendumInfoOf::<T>::insert(ref_index, ReferendumInfo::Ongoing(status));
},
Some(ReferendumInfo::Finished { end, approved }) =>
Some(ReferendumInfo::Finished { end, approved }) => {
if let Some((lock_periods, balance)) = votes[i].1.locked_if(approved) {
let unlock_at = end + T::EnactmentPeriod::get() * lock_periods.into();
let now = frame_system::Pallet::<T>::block_number();
@@ -1438,7 +1438,8 @@ impl<T: Config> Pallet<T> {
);
prior.accumulate(unlock_at, balance)
}
},
}
},
None => {}, // Referendum was cancelled.
}
votes.remove(i);
@@ -14,7 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
static_assertions = "1.1.0"
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
log = { version = "0.4.14", default-features = false }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -30,19 +32,21 @@ frame-election-provider-support = { version = "4.0.0-dev", default-features = fa
# Optional imports for benchmarking
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
rand = { version = "0.7.3", default-features = false, optional = true, features = ["alloc", "small_rng"] }
rand = { version = "0.7.3", default-features = false, optional = true, features = [
"alloc",
"small_rng",
] }
[dev-dependencies]
paste = "1.0.3"
parking_lot = "0.11.0"
rand = { version = "0.7.3" }
hex-literal = "0.3.1"
substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
frame-election-provider-support = { version = "4.0.0-dev", features = ["runtime-benchmarks"], path = "../election-provider-support" }
frame-election-provider-support = { version = "4.0.0-dev", features = [
"runtime-benchmarks",
], path = "../election-provider-support" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
@@ -64,8 +68,5 @@ std = [
"frame-election-provider-support/std",
"log/std",
]
runtime-benchmarks = [
"frame-benchmarking",
"rand",
]
runtime-benchmarks = ["frame-benchmarking", "rand"]
try-runtime = ["frame-support/try-runtime"]
@@ -13,7 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = "../../primitives/npos-elections" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -25,7 +27,6 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "
log = { version = "0.4.14", default-features = false }
[dev-dependencies]
hex-literal = "0.3.1"
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
@@ -679,8 +679,9 @@ pub mod pallet {
// election.
Members::<T>::mutate(|members| {
match members.binary_search_by(|m| m.who.cmp(member)) {
Ok(_) =>
panic!("Duplicate member in elections-phragmen genesis: {}", member),
Ok(_) => {
panic!("Duplicate member in elections-phragmen genesis: {}", member)
},
Err(pos) => members.insert(
pos,
SeatHolder {
+3 -2
View File
@@ -13,7 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -22,7 +24,6 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../su
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
[dev-dependencies]
hex-literal = "0.3.1"
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
@@ -1,6 +1,6 @@
[package]
name = "pallet-example-offchain-worker"
version = "3.0.0-dev"
version = "4.0.0-dev"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
license = "Unlicense"
@@ -21,9 +21,6 @@ sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../pr
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-tasks = { version = "4.0.0-dev", default-features = false, path = "../../primitives/tasks" }
[dev-dependencies]
serde = { version = "1.0.126" }
[features]
default = ["std"]
std = [
+5 -6
View File
@@ -13,7 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
@@ -25,8 +27,7 @@ sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primi
[dev-dependencies]
hex-literal = "0.3.1"
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
pallet-indices = { version = "4.0.0-dev", path = "../indices" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
pallet-transaction-payment = { version = "4.0.0-dev", path = "../transaction-payment" }
sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
@@ -34,9 +35,7 @@ sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
[features]
default = ["std"]
with-tracing = [
"sp-tracing/with-tracing"
]
with-tracing = ["sp-tracing/with-tracing"]
std = [
"codec/std",
"frame-support/std",
+6 -4
View File
@@ -185,10 +185,12 @@ impl<BlockNumber: sp_std::fmt::Debug> sp_std::fmt::Debug for OffchainErr<BlockNu
fn fmt(&self, fmt: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result {
match *self {
OffchainErr::TooEarly => write!(fmt, "Too early to send heartbeat."),
OffchainErr::WaitingForInclusion(ref block) =>
write!(fmt, "Heartbeat already sent at {:?}. Waiting for inclusion.", block),
OffchainErr::AlreadyOnline(auth_idx) =>
write!(fmt, "Authority {} is already online", auth_idx),
OffchainErr::WaitingForInclusion(ref block) => {
write!(fmt, "Heartbeat already sent at {:?}. Waiting for inclusion.", block)
},
OffchainErr::AlreadyOnline(auth_idx) => {
write!(fmt, "Authority {} is already online", auth_idx)
},
OffchainErr::FailedSigning => write!(fmt, "Failed to sign heartbeat"),
OffchainErr::FailedToAcquireLock => write!(fmt, "Failed to acquire lock"),
OffchainErr::NetworkState => write!(fmt, "Failed to fetch network state"),
+3 -2
View File
@@ -13,7 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -26,7 +28,6 @@ frame-support-test = { version = "3.0.0", path = "../support/test" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
serde = { version = "1.0.126" }
[features]
default = ["std"]
@@ -22,7 +22,6 @@ serde = { version = "1.0.126", features = ["derive"] }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
sp-rpc = { version = "4.0.0-dev", path = "../../../primitives/rpc" }
sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
pallet-mmr-primitives = { version = "4.0.0-dev", path = "../primitives" }
-1
View File
@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -21,9 +21,13 @@ pallet-babe = { version = "4.0.0-dev", default-features = false, path = "../../b
pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../balances" }
pallet-grandpa = { version = "4.0.0-dev", default-features = false, path = "../../grandpa" }
pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../im-online" }
pallet-offences = { version = "4.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
pallet-offences = { version = "4.0.0-dev", default-features = false, features = [
"runtime-benchmarks",
], path = "../../offences" }
pallet-session = { version = "4.0.0-dev", default-features = false, path = "../../session" }
pallet-staking = { version = "4.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
pallet-staking = { version = "4.0.0-dev", default-features = false, features = [
"runtime-benchmarks",
], path = "../../staking" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/staking" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/std" }
@@ -32,7 +36,6 @@ frame-election-provider-support = { version = "4.0.0-dev", default-features = fa
[dev-dependencies]
pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
pallet-timestamp = { version = "4.0.0-dev", path = "../../timestamp" }
serde = { version = "1.0.101" }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
-1
View File
@@ -16,7 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["max-encoded-len"] }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
+3 -2
View File
@@ -123,8 +123,9 @@ impl InstanceFilter<Call> for ProxyType {
fn filter(&self, c: &Call) -> bool {
match self {
ProxyType::Any => true,
ProxyType::JustTransfer =>
matches!(c, Call::Balances(pallet_balances::Call::transfer(..))),
ProxyType::JustTransfer => {
matches!(c, Call::Balances(pallet_balances::Call::transfer(..)))
},
ProxyType::JustUtility => matches!(c, Call::Utility(..)),
}
}
-1
View File
@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
enumflags2 = { version = "0.6.2" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
+3 -5
View File
@@ -13,7 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
@@ -27,10 +29,6 @@ sp-trie = { version = "4.0.0-dev", optional = true, default-features = false, pa
log = { version = "0.4.0", default-features = false }
impl-trait-for-tuples = "0.2.1"
[dev-dependencies]
sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
lazy_static = "1.4.0"
[features]
default = ["std", "historical"]
historical = ["sp-trie"]
@@ -19,16 +19,19 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../../../pri
frame-system = { version = "4.0.0-dev", default-features = false, path = "../../system" }
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
pallet-staking = { version = "4.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
pallet-staking = { version = "4.0.0-dev", default-features = false, features = [
"runtime-benchmarks",
], path = "../../staking" }
pallet-session = { version = "4.0.0-dev", default-features = false, path = "../../session" }
rand = { version = "0.7.2", default-features = false }
[dev-dependencies]
serde = { version = "1.0.126" }
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", features = [
"derive",
] }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../../staking/reward-curve" }
sp-io ={ version = "4.0.0-dev", path = "../../../primitives/io" }
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
pallet-timestamp = { version = "4.0.0-dev", path = "../../timestamp" }
pallet-balances = { version = "4.0.0-dev", path = "../../balances" }
frame-election-provider-support = { version = "4.0.0-dev", path = "../../election-provider-support" }
+11 -10
View File
@@ -13,39 +13,40 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
static_assertions = "1.1.0"
serde = { version = "1.0.126", optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-io ={ version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-io = { version = "4.0.0-dev", default-features = false, path = "../../primitives/io" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
pallet-session = { version = "4.0.0-dev", default-features = false, features = ["historical"], path = "../session" }
pallet-session = { version = "4.0.0-dev", default-features = false, features = [
"historical",
], path = "../session" }
pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../authorship" }
sp-application-crypto = { version = "4.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
frame-election-provider-support = { version = "4.0.0-dev", default-features = false, path = "../election-provider-support" }
log = { version = "0.4.14", default-features = false }
paste = "1.0"
# Optional imports for benchmarking
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
rand_chacha = { version = "0.2", default-features = false, optional = true }
[dev-dependencies]
sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward-curve" }
substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
frame-election-provider-support = { version = "4.0.0-dev", features = ["runtime-benchmarks"], path = "../election-provider-support" }
frame-election-provider-support = { version = "4.0.0-dev", features = [
"runtime-benchmarks",
], path = "../election-provider-support" }
rand_chacha = { version = "0.2" }
parking_lot = "0.11.1"
hex = "0.4"
[features]
default = ["std"]
@@ -350,8 +350,9 @@ impl GenericKind {
match self {
GenericKind::None => quote::quote!(),
GenericKind::Config => quote::quote_spanned!(span => T: Config),
GenericKind::ConfigAndInstance =>
quote::quote_spanned!(span => T: Config<I>, I: 'static),
GenericKind::ConfigAndInstance => {
quote::quote_spanned!(span => T: Config<I>, I: 'static)
},
}
}
@@ -53,13 +53,14 @@ impl BuilderDef {
is_generic |= line.is_generic;
data = Some(match &line.storage_type {
StorageLineTypeDef::Simple(_) if line.is_option =>
StorageLineTypeDef::Simple(_) if line.is_option => {
quote_spanned!(builder.span() =>
// NOTE: the type of `data` is specified when used later in the code
let builder: fn(&Self) -> _ = #builder;
let data = builder(self);
let data = Option::as_ref(&data);
),
)
},
_ => quote_spanned!(builder.span() =>
// NOTE: the type of `data` is specified when used later in the code
let builder: fn(&Self) -> _ = #builder;
@@ -70,8 +71,9 @@ impl BuilderDef {
is_generic |= line.is_generic;
data = Some(match &line.storage_type {
StorageLineTypeDef::Simple(_) if line.is_option =>
quote!( let data = Some(&self.#config); ),
StorageLineTypeDef::Simple(_) if line.is_option => {
quote!( let data = Some(&self.#config); )
},
_ => quote!( let data = &self.#config; ),
});
};
@@ -58,12 +58,13 @@ impl<
SignedImbalance::Positive(one.merge(other)),
(SignedImbalance::Negative(one), SignedImbalance::Negative(other)) =>
SignedImbalance::Negative(one.merge(other)),
(SignedImbalance::Positive(one), SignedImbalance::Negative(other)) =>
(SignedImbalance::Positive(one), SignedImbalance::Negative(other)) => {
match one.offset(other) {
SameOrOther::Same(positive) => SignedImbalance::Positive(positive),
SameOrOther::Other(negative) => SignedImbalance::Negative(negative),
SameOrOther::None => SignedImbalance::Positive(P::zero()),
},
}
},
(one, other) => other.merge(one),
}
}
-1
View File
@@ -21,7 +21,6 @@ sp-io = { version = "4.0.0-dev", path = "../../primitives/io", default-features
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
sp-version = { version = "4.0.0-dev", default-features = false, path = "../../primitives/version" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
impl-trait-for-tuples = "0.2.1"
log = { version = "0.4.14", default-features = false }
[dev-dependencies]
@@ -22,8 +22,7 @@ frame-support = { version = "4.0.0-dev", default-features = false, path = "../..
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/core" }
[dev-dependencies]
serde = { version = "1.0.126" }
sp-io ={ version = "4.0.0-dev", path = "../../../primitives/io" }
sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
[features]
default = ["std"]
-1
View File
@@ -24,7 +24,6 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../primitives/timestamp" }
impl-trait-for-tuples = "0.2.1"
log = { version = "0.4.14", default-features = false }
[dev-dependencies]
@@ -13,7 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
serde = { version = "1.0.126", optional = true }
smallvec = "1.4.1"
@@ -27,7 +29,6 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../sys
[dev-dependencies]
serde_json = "1.0.41"
sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
[features]
@@ -27,16 +27,12 @@ sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = false
frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
[dev-dependencies]
frame-support-test = { version = "3.0.0", path = "../support/test" }
sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = true, path = "../../primitives/transaction-storage-proof" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core", default-features = false }
[features]
default = ["std"]
runtime-benchmarks = [
"frame-benchmarking",
"hex-literal",
]
runtime-benchmarks = ["frame-benchmarking", "hex-literal"]
std = [
"serde",
"codec/std",
+5 -3
View File
@@ -13,7 +13,10 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = [
"derive",
"max-encoded-len",
] }
serde = { version = "1.0.126", features = ["derive"], optional = true }
impl-trait-for-tuples = "0.2.1"
@@ -27,9 +30,8 @@ pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../
[dev-dependencies]
sp-io ={ version = "4.0.0-dev", path = "../../primitives/io" }
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
[features]
default = ["std"]
-2
View File
@@ -13,8 +13,6 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
sp-api = { version = "4.0.0-dev", path = "../../primitives/api", default-features = false }
sp-std = { version = "4.0.0-dev", path = "../../primitives/std" , default-features = false }
sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" , default-features = false }
-2
View File
@@ -15,7 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
@@ -32,7 +31,6 @@ default = ["std"]
std = [
"codec/std",
"sp-std/std",
"sp-core/std",
"sp-runtime/std",
"frame-support/std",
"frame-system/std",
+1 -1
View File
@@ -35,7 +35,7 @@ std = [
"frame-support/std",
"frame-system/std",
"sp-io/std",
"sp-std/std"
"sp-std/std",
]
runtime-benchmarks = [
"frame-benchmarking",
+3 -4
View File
@@ -13,8 +13,9 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
enumflags2 = { version = "0.6.2" }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = [
"derive",
] }
sp-std = { version = "4.0.0-dev", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
@@ -25,8 +26,6 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "
sp-io = { version = "4.0.0-dev", path = "../../primitives/io" }
sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
sp-storage = { version = "4.0.0-dev", path = "../../primitives/storage" }
hex-literal = "0.3.1"
[features]
default = ["std"]