pezkuwichain/pezkuwi-runtime-templates
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-runtime-templates.git synced 2026-04-22 02:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MaxLockers (#248)

Browse Source 
* Fix MaxLockers

* fix constants

* fix toolchains

---------

Co-authored-by: Özgün Özerk <ozgunozerk.elo@gmail.com>
This commit is contained in:
Nikita Khateev
2024-07-23 16:24:52 +04:00
committed by GitHub
parent 02b6611ec2
commit 592c3b694d
15 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
evm-template/node/Cargo.toml
+1
View File
@@ -108,6 +108,7 @@ try-runtime = [
"polkadot-cli/try-runtime",
"sp-runtime/try-runtime",
]
txpool = []
[lints]
workspace = true
evm-template/node/src/contracts/abi.rs
+5
View File
@@ -5,11 +5,16 @@ use serde::Deserialize;
#[serde(tag = "type")]
#[serde(rename_all = "lowercase")]
pub enum AbiItem {
#[allow(dead_code)]
Error(Error),
#[allow(dead_code)]
Function(Function),
Constructor,
#[allow(dead_code)]
Event(Event),
#[allow(dead_code)]
Receive(Receive),
#[allow(dead_code)]
Default(Function),
}
evm-template/node/src/contracts/forge.rs
+1
View File
@@ -4,6 +4,7 @@ use super::{abi::AbiItem, deserialize_bytecode};
#[derive(Deserialize)]
pub struct ForgeContract {
#[allow(dead_code)]
pub abi: Vec<AbiItem>,
pub bytecode: ForgeBytecode,
}
evm-template/node/src/contracts/hardhat.rs
+1
View File
@@ -4,6 +4,7 @@ use super::{abi::AbiItem, deserialize_bytecode};
#[derive(Deserialize)]
pub struct HardhatContract {
#[allow(dead_code)]
pub abi: Vec<AbiItem>,
#[serde(deserialize_with = "deserialize_bytecode")]
pub bytecode: Vec<u8>,
evm-template/node/src/contracts/mod.rs
+2
View File
@@ -43,7 +43,9 @@ impl Contract {
#[derive(Debug)]
pub enum ContractParsingError {
#[allow(dead_code)]
MetadataReadError(io::Error),
#[allow(dead_code)]
MetadataParseError(serde_json::Error),
}
evm-template/runtime/src/configs/governance/mod.rs
+1 -1
View File
@@ -36,7 +36,7 @@ impl pallet_conviction_voting::Config for Runtime {
}
parameter_types! {
pub const MaxBalance: Balance = Balance::max_value();
pub const MaxBalance: Balance = Balance::MAX;
}
pub type TreasurySpender = EitherOf<EnsureRootWithSuccess<AccountId, MaxBalance>, Spender>;
evm-template/runtime/src/configs/xcm_config.rs
+1 -2
View File
@@ -214,8 +214,7 @@ pub type XcmRouter = WithUniqueTopic<(
)>;
parameter_types! {
pub const MaxLockers: u32 = 8;
pub const MaxRemoteLockConsumers: u32 = 0;
pub const MaxLockers: u32 = 0;
}
impl pallet_xcm::Config for Runtime {
evm-template/runtime/tests/constants_test.rs
+1 -2
View File
@@ -234,8 +234,7 @@ mod xcm_tests {
#[test]
fn pallet_xcm_constants() {
assert_eq!(MaxLockers::get(), 8);
assert_eq!(MaxRemoteLockConsumers::get(), 0);
assert_eq!(MaxLockers::get(), 0);
assert_eq!(<parachain_template_runtime::Runtime as pallet_xcm::Config>::VERSION_DISCOVERY_QUEUE_SIZE, 100);
}
}
evm-template/rust-toolchain.toml
+1 -1
View File
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2024-02-17"
channel = "nightly-2024-06-12"
targets = ["wasm32-unknown-unknown"]
components = ["rustfmt", "clippy", "rust-src"]
evm-template/template-fuzzer/src/main.rs
-7
View File
@@ -96,7 +96,6 @@ fn main() {
let mut elapsed: Duration = Duration::ZERO;
let start_block = |block: u32, lapse: u32| {
#[cfg(not(fuzzing))]
println!("\ninitializing block {}", block + lapse);
let next_block = block + lapse;
@@ -197,20 +196,17 @@ fn main() {
current_weight = current_weight.saturating_add(call_weight);
if current_weight.ref_time() >= max_weight.ref_time() {
#[cfg(not(fuzzing))]
println!("Skipping because of max weight {max_weight}");
continue;
}
externalities.execute_with(|| {
let origin_account = endowed_accounts[origin % endowed_accounts.len()];
#[cfg(not(fuzzing))]
{
println!("\n origin: {origin_account:?}");
println!(" call: {extrinsic:?}");
}
let _res = extrinsic.clone().dispatch(RuntimeOrigin::signed(origin_account));
#[cfg(not(fuzzing))]
println!(" result: {_res:?}");
// Uncomment to print events for debugging purposes
@@ -228,7 +224,6 @@ fn main() {
elapsed += now.elapsed();
}
#[cfg(not(fuzzing))]
println!("\n time spent: {elapsed:?}");
assert!(elapsed.as_secs() <= MAX_TIME_FOR_BLOCK, "block execution took too much time");
@@ -237,7 +232,6 @@ fn main() {
// Finilization
Executive::finalize_block();
// Invariants
#[cfg(not(fuzzing))]
println!("\ntesting invariants for block {current_block}");
<AllPalletsWithSystem as TryState<BlockNumber>>::try_state(
current_block,
@@ -287,7 +281,6 @@ fn main() {
"Inconsistent total issuance: {total_issuance} but counted {counted_issuance}"
);
#[cfg(not(fuzzing))]
println!("running integrity tests");
// We run all developer-defined integrity tests
<AllPalletsWithSystem as IntegrityTest>::integrity_test();
generic-template/runtime/src/configs/governance/mod.rs
+1 -1
View File
@@ -36,7 +36,7 @@ impl pallet_conviction_voting::Config for Runtime {
}
parameter_types! {
pub const MaxBalance: Balance = Balance::max_value();
pub const MaxBalance: Balance = Balance::MAX;
}
pub type TreasurySpender = EitherOf<EnsureRootWithSuccess<AccountId, MaxBalance>, Spender>;
generic-template/runtime/src/configs/xcm_config.rs
+1 -2
View File
@@ -196,8 +196,7 @@ pub type XcmRouter = WithUniqueTopic<(
)>;
parameter_types! {
pub const MaxLockers: u32 = 8;
pub const MaxRemoteLockConsumers: u32 = 0;
pub const MaxLockers: u32 = 0;
}
impl pallet_xcm::Config for Runtime {
generic-template/runtime/tests/constants_test.rs
+1 -2
View File
@@ -233,8 +233,7 @@ mod xcm_tests {
#[test]
fn pallet_xcm_constants() {
assert_eq!(MaxLockers::get(), 8);
assert_eq!(MaxRemoteLockConsumers::get(), 0);
assert_eq!(MaxLockers::get(), 0);
assert_eq!(<parachain_template_runtime::Runtime as pallet_xcm::Config>::VERSION_DISCOVERY_QUEUE_SIZE, 100);
}
}
generic-template/rust-toolchain.toml
+1 -1
View File
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2024-02-17"
channel = "nightly-2024-06-12"
targets = ["wasm32-unknown-unknown"]
components = ["rustfmt", "clippy", "rust-src"]
generic-template/template-fuzzer/src/main.rs
-7
View File
@@ -89,7 +89,6 @@ fn main() {
let mut elapsed: Duration = Duration::ZERO;
let start_block = |block: u32, lapse: u32| {
#[cfg(not(fuzzing))]
println!("\ninitializing block {}", block + lapse);
let next_block = block + lapse;
@@ -190,20 +189,17 @@ fn main() {
current_weight = current_weight.saturating_add(call_weight);
if current_weight.ref_time() >= max_weight.ref_time() {
#[cfg(not(fuzzing))]
println!("Skipping because of max weight {max_weight}");
continue;
}
externalities.execute_with(|| {
let origin_account = endowed_accounts[origin % endowed_accounts.len()].clone();
#[cfg(not(fuzzing))]
{
println!("\n origin: {origin_account:?}");
println!(" call: {extrinsic:?}");
}
let _res = extrinsic.clone().dispatch(RuntimeOrigin::signed(origin_account));
#[cfg(not(fuzzing))]
println!(" result: {_res:?}");
// Uncomment to print events for debugging purposes
@@ -221,7 +217,6 @@ fn main() {
elapsed += now.elapsed();
}
#[cfg(not(fuzzing))]
println!("\n time spent: {elapsed:?}");
assert!(elapsed.as_secs() <= MAX_TIME_FOR_BLOCK, "block execution took too much time");
@@ -230,7 +225,6 @@ fn main() {
// Finilization
Executive::finalize_block();
// Invariants
#[cfg(not(fuzzing))]
println!("\ntesting invariants for block {current_block}");
<AllPalletsWithSystem as TryState<BlockNumber>>::try_state(
current_block,
@@ -280,7 +274,6 @@ fn main() {
"Inconsistent total issuance: {total_issuance} but counted {counted_issuance}"
);
#[cfg(not(fuzzing))]
println!("running integrity tests");
// We run all developer-defined integrity tests
<AllPalletsWithSystem as IntegrityTest>::integrity_test();