Skip to content
Snippets Groups Projects
Unverified Commit c98317e2 authored by bgallois's avatar bgallois
Browse files

fix #124

parent 54d8caf9
No related branches found
No related tags found
No related merge requests found
Pipeline #34953 passed
......@@ -43,7 +43,6 @@ pub mod pallet {
use frame_support::traits::{StorageVersion, StoredMap};
use frame_system::pallet_prelude::*;
use sp_runtime::traits::Convert;
use sp_std::vec::Vec;
pub type BalanceOf<T> =
<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
......@@ -69,9 +68,6 @@ pub mod pallet {
type MembersCount: Get<BalanceOf<Self>>;
/// Somethings that must provide the list of accounts ids allowed to create the universal dividend
type MembersStorage: frame_support::traits::StoredMap<Self::AccountId, FirstEligibleUd>;
/// An iterator over all members
type MembersStorageIter: From<Option<Vec<u8>>>
+ Iterator<Item = (Self::AccountId, FirstEligibleUd)>;
/// Because this pallet emits events, it depends on the runtime's definition of an event.
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
#[pallet::constant]
......
......@@ -139,23 +139,6 @@ impl frame_support::traits::StoredMap<u32, FirstEligibleUd> for TestMembersStora
Ok(result)
}
}
pub struct TestMembersStorageIter(frame_support::storage::PrefixIterator<(u32, FirstEligibleUd)>);
impl From<Option<Vec<u8>>> for TestMembersStorageIter {
fn from(maybe_key: Option<Vec<u8>>) -> Self {
let mut iter = crate::TestMembers::<Test>::iter();
if let Some(key) = maybe_key {
iter.set_last_raw_key(key);
}
Self(iter)
}
}
impl Iterator for TestMembersStorageIter {
type Item = (u32, FirstEligibleUd);
fn next(&mut self) -> Option<Self::Item> {
self.0.next()
}
}
impl pallet_universal_dividend::Config for Test {
type MomentIntoBalance = sp_runtime::traits::ConvertInto;
......@@ -163,7 +146,6 @@ impl pallet_universal_dividend::Config for Test {
type MaxPastReeval = frame_support::traits::ConstU32<2>;
type MembersCount = MembersCount;
type MembersStorage = TestMembersStorage;
type MembersStorageIter = TestMembersStorageIter;
type RuntimeEvent = RuntimeEvent;
type SquareMoneyGrowthRate = SquareMoneyGrowthRate;
type UdCreationPeriod = UdCreationPeriod;
......
......@@ -439,7 +439,6 @@ macro_rules! pallets_config {
type MaxPastReeval = frame_support::traits::ConstU32<160>;
type MembersCount = MembersCount;
type MembersStorage = common_runtime::providers::UdMembersStorage<Runtime>;
type MembersStorageIter = common_runtime::providers::UdMembersStorageIter<Runtime>;
type SquareMoneyGrowthRate = SquareMoneyGrowthRate;
type UdCreationPeriod = UdCreationPeriod;
type UdReevalPeriod = UdReevalPeriod;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment