Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Completely remove cumulus (dev-)dependencies #44

Closed
wants to merge 21 commits into from
Closed

Completely remove cumulus (dev-)dependencies #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f57daeb
prune nimbus-primitives
JoshOrndorff Aug 23, 2021
5fead18
update branches and toolchain
JoshOrndorff Aug 23, 2021
6238fc7
reflect new events from https://github.com/paritytech/substrate/pull/…
JoshOrndorff Aug 23, 2021
bc27634
core change. pallet compiles.
JoshOrndorff Aug 23, 2021
15f1f93
remove some seemingly-unnecessary trait bounds
JoshOrndorff Aug 23, 2021
c88c9da
fix test mock
JoshOrndorff Aug 23, 2021
f6b10a8
make cumulus stuff dev-dependencies
JoshOrndorff Aug 23, 2021
6d6230e
Tests compile, but 7 fail
JoshOrndorff Aug 23, 2021
ad451b6
unused imports
JoshOrndorff Aug 23, 2021
a43227d
totally prune the dependencies
JoshOrndorff Aug 23, 2021
9970ba1
fix one test
JoshOrndorff Aug 23, 2021
7f16a85
another one fixed
JoshOrndorff Aug 23, 2021
99fb15c
step_by_step works
JoshOrndorff Aug 23, 2021
f8c4f4a
after_unclaimed_period
JoshOrndorff Aug 23, 2021
f09e84b
below vesting period
JoshOrndorff Aug 23, 2021
d0085b2
tests pass
JoshOrndorff Aug 23, 2021
bd005fe
Add custom trait for block provider, with a setter for benchmarking
girazoki Sep 1, 2021
2500bbf
Adapt mock runtime to new trait
girazoki Sep 1, 2021
999dbbe
Adapt benchmarks to new setter
girazoki Sep 1, 2021
f79ddb9
Add comment to not forget the removal of the trait once the substrate…
girazoki Sep 1, 2021
722da9a
Add another comment so that we ensure we dont forget to change the pr…
girazoki Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,17 @@ parity-scale-codec = { version = "2.1.1", default-features = false}
serde = { version = "1.0.101", optional = true, features = ["derive"], default-features = false }
log = { version = "0.4", default-features = false }

frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false, optional = true }
cumulus-pallet-parachain-system = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
nimbus-primitives = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9" }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false }
pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true }
ed25519-dalek = { version = "1.0.1", default-features = false, features = ["u64_backend", "alloc"], optional = true }
sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8", optional = true }

[dev-dependencies]
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", default-features = false, branch = "joshy-np098" }
sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.9", optional = true }

[features]
default = ["std"]
Expand All @@ -44,10 +37,6 @@ std = [
"log/std",
"sp-std/std",
"sp-io/std",
"cumulus-pallet-parachain-system/std",
"cumulus-primitives-core/std",
"nimbus-primitives/std",
"cumulus-primitives-parachain-inherent/std",
]
runtime-benchmarks = [
"frame-benchmarking",
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2021-02-21"
channel = "nightly-2021-08-01"
components = [ "rustfmt", "clippy" ]
targets = [ "wasm32-unknown-unknown" ]
profile = "minimal"
148 changes: 14 additions & 134 deletions src/benchmarks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
#![cfg(feature = "runtime-benchmarks")]

use crate::pallet::BlockProvider;
use crate::{BalanceOf, Call, Config, Pallet};
use cumulus_pallet_parachain_system::Pallet as RelayPallet;
use cumulus_primitives_core::{
relay_chain::{v1::HeadData, BlockNumber as RelayChainBlockNumber},
PersistedValidationData,
};
use cumulus_primitives_parachain_inherent::ParachainInherentData;
use ed25519_dalek::Signer;
use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite};
use frame_support::{
dispatch::UnfilteredDispatchable,
inherent::{InherentData, ProvideInherent},
traits::{Currency, Get, OnFinalize, OnInitialize},
};
use frame_support::traits::{Currency, Get, OnFinalize};
use frame_system::RawOrigin;
use parity_scale_codec::Encode;
use sp_core::{
Expand All @@ -23,21 +14,6 @@ use sp_core::{
use sp_runtime::{traits::One, MultiSignature};
use sp_std::vec;
use sp_std::vec::Vec;
use sp_trie::StorageProof;
// This is a fake proof that emulates a storage proof inserted as the validation data
// We avoid using the sproof builder here because it generates an issue when compiling without std
// Fake storage proof
const MOCK_PROOF: [u8; 71] = [
127, 1, 6, 222, 61, 138, 84, 210, 126, 68, 169, 213, 206, 24, 150, 24, 242, 45, 180, 180, 157,
149, 50, 13, 144, 33, 153, 76, 133, 15, 37, 184, 227, 133, 144, 0, 0, 32, 0, 0, 0, 16, 0, 8, 0,
0, 0, 0, 4, 0, 0, 0, 1, 0, 0, 5, 0, 0, 0, 5, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0,
];

// fake storage root. This is valid with the previous proof
const MOCK_PROOF_HASH: [u8; 32] = [
216, 6, 227, 175, 180, 211, 98, 117, 202, 245, 206, 51, 21, 143, 100, 232, 96, 217, 14, 71,
243, 146, 7, 202, 245, 129, 165, 70, 72, 184, 130, 141,
];

/// Default balance amount is minimum contribution
fn default_balance<T: Config>() -> BalanceOf<T> {
Expand Down Expand Up @@ -67,33 +43,6 @@ fn create_funded_user<T: Config>(
user
}

fn create_inherent_data<T: Config>(block_number: u32) -> InherentData {
//let (relay_parent_storage_root, relay_chain_state) = create_fake_valid_proof();
let vfp = PersistedValidationData {
relay_parent_number: block_number as RelayChainBlockNumber,
relay_parent_storage_root: MOCK_PROOF_HASH.into(),
max_pov_size: 1000u32,
parent_head: HeadData(vec![1, 1, 1]),
};
let inherent_data = {
let mut inherent_data = InherentData::default();
let system_inherent_data = ParachainInherentData {
validation_data: vfp.clone(),
relay_chain_state: StorageProof::new(vec![MOCK_PROOF.to_vec()]),
downward_messages: Default::default(),
horizontal_messages: Default::default(),
};
inherent_data
.put_data(
cumulus_primitives_parachain_inherent::INHERENT_IDENTIFIER,
&system_inherent_data,
)
.expect("failed to put VFP inherent");
inherent_data
};
inherent_data
}

/// Create contributors.
fn create_contributors<T: Config>(
total_number: u32,
Expand Down Expand Up @@ -135,7 +84,7 @@ fn insert_contributors<T: Config>(
}

/// Create a Contributor.
fn close_initialization<T: Config>(end_relay: RelayChainBlockNumber) -> Result<(), &'static str> {
fn close_initialization<T: Config>(end_relay: T::VestingBlockNumber) -> Result<(), &'static str> {
Pallet::<T>::complete_initialization(RawOrigin::Root.into(), end_relay)?;
Ok(())
}
Expand Down Expand Up @@ -197,16 +146,10 @@ benchmarks! {
insert_contributors::<T>(contributors)?;

// We need to create the first block inherent, to initialize the initRelayBlock
let first_block_inherent = create_inherent_data::<T>(1u32);
RelayPallet::<T>::on_initialize(T::BlockNumber::one());
RelayPallet::<T>::create_inherent(&first_block_inherent)
.expect("got an inherent")
.dispatch_bypass_filter(RawOrigin::None.into())
.expect("dispatch succeeded");
RelayPallet::<T>::on_finalize(T::BlockNumber::one());
T::VestingBlockProvider::set_block_number(1u32.into());
Pallet::<T>::on_finalize(T::BlockNumber::one());

}: _(RawOrigin::Root, 10u32)
}: _(RawOrigin::Root, 10u32.into())
verify {
assert!(Pallet::<T>::initialized());
}
Expand All @@ -231,29 +174,19 @@ benchmarks! {
close_initialization::<T>(10u32.into())?;

// First inherent
let first_block_inherent = create_inherent_data::<T>(1u32);
RelayPallet::<T>::on_initialize(T::BlockNumber::one());
RelayPallet::<T>::create_inherent(&first_block_inherent)
.expect("got an inherent")
.dispatch_bypass_filter(RawOrigin::None.into())
.expect("dispatch succeeded");
RelayPallet::<T>::on_finalize(T::BlockNumber::one());
T::VestingBlockProvider::set_block_number(1u32.into());
Pallet::<T>::on_finalize(T::BlockNumber::one());

// Create 4th relay block, by now the user should have vested some amount
RelayPallet::<T>::on_initialize(4u32.into());
// Claimed
let claimed_reward = Pallet::<T>::accounts_payable(&caller).unwrap().claimed_reward;

let last_block_inherent = create_inherent_data::<T>(4u32);
RelayPallet::<T>::create_inherent(&last_block_inherent)
.expect("got an inherent")
.dispatch_bypass_filter(RawOrigin::None.into())
.expect("dispatch succeeded");
// Create 4th relay block, by now the user should have vested some amount
T::VestingBlockProvider::set_block_number(4u32.into());

RelayPallet::<T>::on_finalize(4u32.into());

}: _(RawOrigin::Signed(caller.clone()))
verify {
assert_eq!(Pallet::<T>::accounts_payable(&caller).unwrap().total_reward, (100u32.into()));
assert!(Pallet::<T>::accounts_payable(&caller).unwrap().claimed_reward > claimed_reward);
}

update_reward_address {
Expand All @@ -277,26 +210,12 @@ benchmarks! {
close_initialization::<T>(10u32.into())?;

// First inherent
let first_block_inherent = create_inherent_data::<T>(1u32);
RelayPallet::<T>::on_initialize(T::BlockNumber::one());
RelayPallet::<T>::create_inherent(&first_block_inherent)
.expect("got an inherent")
.dispatch_bypass_filter(RawOrigin::None.into())
.expect("dispatch succeeded");
RelayPallet::<T>::on_finalize(T::BlockNumber::one());
T::VestingBlockProvider::set_block_number(1u32.into());
Pallet::<T>::on_finalize(T::BlockNumber::one());


// Let's advance the relay so that the vested amount get transferred

RelayPallet::<T>::on_initialize(4u32.into());
let last_block_inherent = create_inherent_data::<T>(4u32);
RelayPallet::<T>::create_inherent(&last_block_inherent)
.expect("got an inherent")
.dispatch_bypass_filter(RawOrigin::None.into())
.expect("dispatch succeeded");

RelayPallet::<T>::on_finalize(4u32.into());
T::VestingBlockProvider::set_block_number(4u32.into());

// The new user
let new_user = create_funded_user::<T>("user", SEED+1, 0u32.into());
Expand Down Expand Up @@ -330,13 +249,7 @@ benchmarks! {
close_initialization::<T>(10u32.into())?;

// First inherent
let first_block_inherent = create_inherent_data::<T>(1u32);
RelayPallet::<T>::on_initialize(T::BlockNumber::one());
RelayPallet::<T>::create_inherent(&first_block_inherent)
.expect("got an inherent")
.dispatch_bypass_filter(RawOrigin::None.into())
.expect("dispatch succeeded");
RelayPallet::<T>::on_finalize(T::BlockNumber::one());
T::VestingBlockProvider::set_block_number(1u32.into());
Pallet::<T>::on_finalize(T::BlockNumber::one());

}: _(RawOrigin::Signed(caller.clone()), caller.clone(), relay_account.into(), signature)
Expand All @@ -347,9 +260,7 @@ benchmarks! {
}
#[cfg(test)]
mod tests {
use super::*;
use crate::mock::Test;
use frame_support::assert_ok;
use sp_io::TestExternalities;

pub fn new_test_ext() -> TestExternalities {
Expand All @@ -358,37 +269,6 @@ mod tests {
.unwrap();
TestExternalities::new(t)
}

#[test]
fn bench_init_reward_vec() {
new_test_ext().execute_with(|| {
assert_ok!(test_benchmark_initialize_reward_vec::<Test>());
});
}
#[test]
fn bench_complete_initialization() {
new_test_ext().execute_with(|| {
assert_ok!(test_benchmark_complete_initialization::<Test>());
});
}
#[test]
fn bench_claim() {
new_test_ext().execute_with(|| {
assert_ok!(test_benchmark_claim::<Test>());
});
}
#[test]
fn bench_update_reward_address() {
new_test_ext().execute_with(|| {
assert_ok!(test_benchmark_update_reward_address::<Test>());
});
}
#[test]
fn bench_associate_native_identity() {
new_test_ext().execute_with(|| {
assert_ok!(test_benchmark_associate_native_identity::<Test>());
});
}
}

impl_benchmark_test_suite!(
Expand Down
Loading