diff --git a/prdoc/pr_4392.prdoc b/prdoc/pr_4392.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..898ce9be069e20a09ccbe1ee4a85bcec36893f02
--- /dev/null
+++ b/prdoc/pr_4392.prdoc
@@ -0,0 +1,16 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Remove `pallet::getter` usage from both bounties and child bounties pallet
+
+doc:
+ - audience: Runtime Dev
+ description: |
+ This PR removes `pallet::getter`s from `pallet-bounties` and `pallet-child-bounties`.
+ The syntax `StorageItem::<T, I>::get()` should be used instead.
+
+crates:
+ - name: pallet-bounties
+ bump: major
+ - name: pallet-child-bounties
+ bump: major
diff --git a/substrate/frame/bounties/src/lib.rs b/substrate/frame/bounties/src/lib.rs
index c099fc48b7a3bceb94e8b026386c84aed4edf818..c930868bf10159326bae978553eadcbd3fe03128 100644
--- a/substrate/frame/bounties/src/lib.rs
+++ b/substrate/frame/bounties/src/lib.rs
@@ -303,12 +303,10 @@ pub mod pallet {
/// Number of bounty proposals that have been made.
#[pallet::storage]
- #[pallet::getter(fn bounty_count)]
pub type BountyCount<T: Config<I>, I: 'static = ()> = StorageValue<_, BountyIndex, ValueQuery>;
/// Bounties that have been made.
#[pallet::storage]
- #[pallet::getter(fn bounties)]
pub type Bounties<T: Config<I>, I: 'static = ()> = StorageMap<
_,
Twox64Concat,
@@ -318,13 +316,11 @@ pub mod pallet {
/// The description of each bounty.
#[pallet::storage]
- #[pallet::getter(fn bounty_descriptions)]
pub type BountyDescriptions<T: Config<I>, I: 'static = ()> =
StorageMap<_, Twox64Concat, BountyIndex, BoundedVec<u8, T::MaximumReasonLength>>;
/// Bounty indices that have been approved but not yet funded.
#[pallet::storage]
- #[pallet::getter(fn bounty_approvals)]
pub type BountyApprovals<T: Config<I>, I: 'static = ()> =
StorageValue<_, BoundedVec<BountyIndex, T::MaxApprovals>, ValueQuery>;
@@ -849,7 +845,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
description.try_into().map_err(|_| Error::<T, I>::ReasonTooBig)?;
ensure!(value >= T::BountyValueMinimum::get(), Error::<T, I>::InvalidValue);
- let index = Self::bounty_count();
+ let index = BountyCount::<T, I>::get();
// reserve deposit for new bounty
let bond = T::BountyDepositBase::get() +
diff --git a/substrate/frame/bounties/src/tests.rs b/substrate/frame/bounties/src/tests.rs
index de747db53749902ad6164265e3cad139ddefa7da..a89f4ff9fbf301a8d03d9ad040a1b4009e7b18f6 100644
--- a/substrate/frame/bounties/src/tests.rs
+++ b/substrate/frame/bounties/src/tests.rs
@@ -534,7 +534,7 @@ fn propose_bounty_works() {
assert_eq!(Balances::free_balance(0), 100 - deposit);
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee: 0,
@@ -545,9 +545,12 @@ fn propose_bounty_works() {
}
);
- assert_eq!(Bounties::bounty_descriptions(0).unwrap(), b"1234567890".to_vec());
+ assert_eq!(
+ pallet_bounties::BountyDescriptions::<Test>::get(0).unwrap(),
+ b"1234567890".to_vec()
+ );
- assert_eq!(Bounties::bounty_count(), 1);
+ assert_eq!(pallet_bounties::BountyCount::<Test>::get(), 1);
});
}
@@ -598,10 +601,10 @@ fn close_bounty_works() {
assert_eq!(Balances::reserved_balance(0), 0);
assert_eq!(Balances::free_balance(0), 100 - deposit);
- assert_eq!(Bounties::bounties(0), None);
+ assert_eq!(pallet_bounties::Bounties::<Test>::get(0), None);
assert!(!pallet_treasury::Proposals::<Test>::contains_key(0));
- assert_eq!(Bounties::bounty_descriptions(0), None);
+ assert_eq!(pallet_bounties::BountyDescriptions::<Test>::get(0), None);
});
}
@@ -622,7 +625,7 @@ fn approve_bounty_works() {
let deposit: u64 = 80 + 5;
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee: 0,
@@ -632,7 +635,7 @@ fn approve_bounty_works() {
status: BountyStatus::Approved,
}
);
- assert_eq!(Bounties::bounty_approvals(), vec![0]);
+ assert_eq!(pallet_bounties::BountyApprovals::<Test>::get(), vec![0]);
assert_noop!(
Bounties::close_bounty(RuntimeOrigin::root(), 0),
@@ -650,7 +653,7 @@ fn approve_bounty_works() {
assert_eq!(Balances::free_balance(0), 100);
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee: 0,
@@ -693,7 +696,7 @@ fn assign_curator_works() {
assert_ok!(Bounties::propose_curator(RuntimeOrigin::root(), 0, 4, fee));
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee,
@@ -720,7 +723,7 @@ fn assign_curator_works() {
let expected_deposit = Bounties::calculate_curator_deposit(&fee);
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee,
@@ -755,7 +758,7 @@ fn unassign_curator_works() {
assert_ok!(Bounties::unassign_curator(RuntimeOrigin::signed(4), 0));
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee,
@@ -773,7 +776,7 @@ fn unassign_curator_works() {
assert_ok!(Bounties::unassign_curator(RuntimeOrigin::root(), 0));
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee,
@@ -817,7 +820,7 @@ fn award_and_claim_bounty_works() {
assert_ok!(Bounties::award_bounty(RuntimeOrigin::signed(4), 0, 3));
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee,
@@ -851,8 +854,8 @@ fn award_and_claim_bounty_works() {
assert_eq!(Balances::free_balance(3), 56);
assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 0);
- assert_eq!(Bounties::bounties(0), None);
- assert_eq!(Bounties::bounty_descriptions(0), None);
+ assert_eq!(pallet_bounties::Bounties::<Test>::get(0), None);
+ assert_eq!(pallet_bounties::BountyDescriptions::<Test>::get(0), None);
});
}
@@ -892,8 +895,8 @@ fn claim_handles_high_fee() {
assert_eq!(Balances::free_balance(3), 0);
assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 0);
- assert_eq!(Bounties::bounties(0), None);
- assert_eq!(Bounties::bounty_descriptions(0), None);
+ assert_eq!(pallet_bounties::Bounties::<Test>::get(0), None);
+ assert_eq!(pallet_bounties::BountyDescriptions::<Test>::get(0), None);
});
}
@@ -918,7 +921,7 @@ fn cancel_and_refund() {
));
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee: 0,
@@ -978,8 +981,8 @@ fn award_and_cancel() {
assert_eq!(Balances::free_balance(0), 95);
assert_eq!(Balances::reserved_balance(0), 0);
- assert_eq!(Bounties::bounties(0), None);
- assert_eq!(Bounties::bounty_descriptions(0), None);
+ assert_eq!(pallet_bounties::Bounties::<Test>::get(0), None);
+ assert_eq!(pallet_bounties::BountyDescriptions::<Test>::get(0), None);
});
}
@@ -1015,7 +1018,7 @@ fn expire_and_unassign() {
assert_ok!(Bounties::unassign_curator(RuntimeOrigin::signed(0), 0));
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee: 10,
@@ -1065,7 +1068,7 @@ fn extend_expiry() {
assert_ok!(Bounties::extend_bounty_expiry(RuntimeOrigin::signed(4), 0, Vec::new()));
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee: 10,
@@ -1079,7 +1082,7 @@ fn extend_expiry() {
assert_ok!(Bounties::extend_bounty_expiry(RuntimeOrigin::signed(4), 0, Vec::new()));
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee: 10,
@@ -1190,7 +1193,7 @@ fn unassign_curator_self() {
assert_ok!(Bounties::unassign_curator(RuntimeOrigin::signed(1), 0));
assert_eq!(
- Bounties::bounties(0).unwrap(),
+ pallet_bounties::Bounties::<Test>::get(0).unwrap(),
Bounty {
proposer: 0,
fee: 10,
diff --git a/substrate/frame/child-bounties/src/benchmarking.rs b/substrate/frame/child-bounties/src/benchmarking.rs
index 1973564d0dc1dacca9d30421cda2b4b03771cef9..947cfcfaa96a2daeb88c68c9cda501c42554fbe3 100644
--- a/substrate/frame/child-bounties/src/benchmarking.rs
+++ b/substrate/frame/child-bounties/src/benchmarking.rs
@@ -109,7 +109,7 @@ fn activate_bounty<T: Config>(
child_bounty_setup.reason.clone(),
)?;
- child_bounty_setup.bounty_id = Bounties::<T>::bounty_count() - 1;
+ child_bounty_setup.bounty_id = pallet_bounties::BountyCount::<T>::get() - 1;
let approve_origin =
T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
diff --git a/substrate/frame/child-bounties/src/lib.rs b/substrate/frame/child-bounties/src/lib.rs
index 1eedeaa5a1ae3c5aa6b3804117921eab63768d1e..04a1f9799cb86e8831a849620b8288fc0692a9c8 100644
--- a/substrate/frame/child-bounties/src/lib.rs
+++ b/substrate/frame/child-bounties/src/lib.rs
@@ -181,19 +181,16 @@ pub mod pallet {
/// Number of total child bounties.
#[pallet::storage]
- #[pallet::getter(fn child_bounty_count)]
pub type ChildBountyCount<T: Config> = StorageValue<_, BountyIndex, ValueQuery>;
/// Number of child bounties per parent bounty.
/// Map of parent bounty index to number of child bounties.
#[pallet::storage]
- #[pallet::getter(fn parent_child_bounties)]
pub type ParentChildBounties<T: Config> =
StorageMap<_, Twox64Concat, BountyIndex, u32, ValueQuery>;
/// Child bounties that have been added.
#[pallet::storage]
- #[pallet::getter(fn child_bounties)]
pub type ChildBounties<T: Config> = StorageDoubleMap<
_,
Twox64Concat,
@@ -205,13 +202,11 @@ pub mod pallet {
/// The description of each child-bounty.
#[pallet::storage]
- #[pallet::getter(fn child_bounty_descriptions)]
pub type ChildBountyDescriptions<T: Config> =
StorageMap<_, Twox64Concat, BountyIndex, BoundedVec<u8, T::MaximumReasonLength>>;
/// The cumulative child-bounty curator fee for each parent bounty.
#[pallet::storage]
- #[pallet::getter(fn children_curator_fees)]
pub type ChildrenCuratorFees<T: Config> =
StorageMap<_, Twox64Concat, BountyIndex, BalanceOf<T>, ValueQuery>;
@@ -251,7 +246,7 @@ pub mod pallet {
description.try_into().map_err(|_| BountiesError::<T>::ReasonTooBig)?;
ensure!(value >= T::ChildBountyValueMinimum::get(), BountiesError::<T>::InvalidValue);
ensure!(
- Self::parent_child_bounties(parent_bounty_id) <=
+ ParentChildBounties::<T>::get(parent_bounty_id) <=
T::MaxActiveChildBountyCount::get() as u32,
Error::<T>::TooManyChildBounties,
);
@@ -276,15 +271,15 @@ pub mod pallet {
)?;
// Get child-bounty ID.
- let child_bounty_id = Self::child_bounty_count();
+ let child_bounty_id = ChildBountyCount::<T>::get();
let child_bounty_account = Self::child_bounty_account_id(child_bounty_id);
// Transfer funds from parent bounty to child-bounty.
T::Currency::transfer(&parent_bounty_account, &child_bounty_account, value, KeepAlive)?;
// Increment the active child-bounty count.
- <ParentChildBounties<T>>::mutate(parent_bounty_id, |count| count.saturating_inc());
- <ChildBountyCount<T>>::put(child_bounty_id.saturating_add(1));
+ ParentChildBounties::<T>::mutate(parent_bounty_id, |count| count.saturating_inc());
+ ChildBountyCount::<T>::put(child_bounty_id.saturating_add(1));
// Create child-bounty instance.
Self::create_child_bounty(
@@ -710,12 +705,12 @@ pub mod pallet {
});
// Update the active child-bounty tracking count.
- <ParentChildBounties<T>>::mutate(parent_bounty_id, |count| {
+ ParentChildBounties::<T>::mutate(parent_bounty_id, |count| {
count.saturating_dec()
});
// Remove the child-bounty description.
- <ChildBountyDescriptions<T>>::remove(child_bounty_id);
+ ChildBountyDescriptions::<T>::remove(child_bounty_id);
// Remove the child-bounty instance from the state.
*maybe_child_bounty = None;
@@ -817,7 +812,7 @@ impl<T: Config> Pallet<T> {
fn ensure_bounty_active(
bounty_id: BountyIndex,
) -> Result<(T::AccountId, BlockNumberFor<T>), DispatchError> {
- let parent_bounty = pallet_bounties::Pallet::<T>::bounties(bounty_id)
+ let parent_bounty = pallet_bounties::Bounties::<T>::get(bounty_id)
.ok_or(BountiesError::<T>::InvalidIndex)?;
if let BountyStatus::Active { curator, update_due } = parent_bounty.get_status() {
Ok((curator, update_due))
@@ -862,7 +857,7 @@ impl<T: Config> Pallet<T> {
ChildrenCuratorFees::<T>::mutate(parent_bounty_id, |value| {
*value = value.saturating_sub(child_bounty.fee)
});
- <ParentChildBounties<T>>::mutate(parent_bounty_id, |count| {
+ ParentChildBounties::<T>::mutate(parent_bounty_id, |count| {
*count = count.saturating_sub(1)
});
@@ -880,7 +875,7 @@ impl<T: Config> Pallet<T> {
debug_assert!(transfer_result.is_ok());
// Remove the child-bounty description.
- <ChildBountyDescriptions<T>>::remove(child_bounty_id);
+ ChildBountyDescriptions::<T>::remove(child_bounty_id);
*maybe_child_bounty = None;
@@ -901,14 +896,14 @@ impl<T: Config> pallet_bounties::ChildBountyManager<BalanceOf<T>> for Pallet<T>
fn child_bounties_count(
bounty_id: pallet_bounties::BountyIndex,
) -> pallet_bounties::BountyIndex {
- Self::parent_child_bounties(bounty_id)
+ ParentChildBounties::<T>::get(bounty_id)
}
fn children_curator_fees(bounty_id: pallet_bounties::BountyIndex) -> BalanceOf<T> {
// This is asked for when the parent bounty is being claimed. No use of
// keeping it in state after that. Hence removing.
- let children_fee_total = Self::children_curator_fees(bounty_id);
- <ChildrenCuratorFees<T>>::remove(bounty_id);
+ let children_fee_total = ChildrenCuratorFees::<T>::get(bounty_id);
+ ChildrenCuratorFees::<T>::remove(bounty_id);
children_fee_total
}
}
diff --git a/substrate/frame/child-bounties/src/tests.rs b/substrate/frame/child-bounties/src/tests.rs
index 30601f821e4384827059ffc694ab0108a347bf8b..d9405d3d28977c2cac3b42a034eb5fcfe8e56e8f 100644
--- a/substrate/frame/child-bounties/src/tests.rs
+++ b/substrate/frame/child-bounties/src/tests.rs
@@ -264,7 +264,7 @@ fn add_child_bounty() {
// DB check.
// Check the child-bounty status.
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -275,10 +275,13 @@ fn add_child_bounty() {
);
// Check the child-bounty count.
- assert_eq!(ChildBounties::parent_child_bounties(0), 1);
+ assert_eq!(pallet_child_bounties::ParentChildBounties::<Test>::get(0), 1);
// Check the child-bounty description status.
- assert_eq!(ChildBounties::child_bounty_descriptions(0).unwrap(), b"12345-p1".to_vec(),);
+ assert_eq!(
+ pallet_child_bounties::ChildBountyDescriptions::<Test>::get(0).unwrap(),
+ b"12345-p1".to_vec(),
+ );
});
}
@@ -340,7 +343,7 @@ fn child_bounty_assign_curator() {
assert_ok!(ChildBounties::propose_curator(RuntimeOrigin::signed(4), 0, 0, 8, fee));
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -364,7 +367,7 @@ fn child_bounty_assign_curator() {
let expected_child_deposit = CuratorDepositMultiplier::get() * fee;
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -441,7 +444,7 @@ fn award_claim_child_bounty() {
let expected_deposit = CuratorDepositMultiplier::get() * fee;
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -479,7 +482,7 @@ fn award_claim_child_bounty() {
assert_eq!(Balances::reserved_balance(ChildBounties::child_bounty_account_id(0)), 0);
// Check the child-bounty count.
- assert_eq!(ChildBounties::parent_child_bounties(0), 0);
+ assert_eq!(pallet_child_bounties::ParentChildBounties::<Test>::get(0), 0);
});
}
@@ -528,7 +531,7 @@ fn close_child_bounty_added() {
assert_ok!(ChildBounties::close_child_bounty(RuntimeOrigin::signed(4), 0, 0));
// Check the child-bounty count.
- assert_eq!(ChildBounties::parent_child_bounties(0), 0);
+ assert_eq!(pallet_child_bounties::ParentChildBounties::<Test>::get(0), 0);
// Parent-bounty account status.
assert_eq!(Balances::free_balance(Bounties::bounty_account_id(0)), 50);
@@ -582,7 +585,7 @@ fn close_child_bounty_active() {
assert_ok!(ChildBounties::close_child_bounty(RuntimeOrigin::signed(4), 0, 0));
// Check the child-bounty count.
- assert_eq!(ChildBounties::parent_child_bounties(0), 0);
+ assert_eq!(pallet_child_bounties::ParentChildBounties::<Test>::get(0), 0);
// Ensure child-bounty curator balance is unreserved.
assert_eq!(Balances::free_balance(8), 101);
@@ -647,7 +650,7 @@ fn close_child_bounty_pending() {
);
// Check the child-bounty count.
- assert_eq!(ChildBounties::parent_child_bounties(0), 1);
+ assert_eq!(pallet_child_bounties::ParentChildBounties::<Test>::get(0), 1);
// Ensure no changes in child-bounty curator balance.
assert_eq!(Balances::reserved_balance(8), expected_child_deposit);
@@ -739,7 +742,7 @@ fn child_bounty_curator_proposed_unassign_curator() {
assert_ok!(ChildBounties::propose_curator(RuntimeOrigin::signed(4), 0, 0, 8, 2));
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -757,7 +760,7 @@ fn child_bounty_curator_proposed_unassign_curator() {
// Verify updated child-bounty status.
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -820,7 +823,7 @@ fn child_bounty_active_unassign_curator() {
let expected_child_deposit = CuratorDepositMultiplier::get() * fee;
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -838,7 +841,7 @@ fn child_bounty_active_unassign_curator() {
// Verify updated child-bounty status.
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -859,7 +862,7 @@ fn child_bounty_active_unassign_curator() {
let expected_child_deposit = CuratorDepositMin::get();
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -877,7 +880,7 @@ fn child_bounty_active_unassign_curator() {
// Verify updated child-bounty status.
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -896,7 +899,7 @@ fn child_bounty_active_unassign_curator() {
assert_ok!(ChildBounties::accept_curator(RuntimeOrigin::signed(6), 0, 0));
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -914,7 +917,7 @@ fn child_bounty_active_unassign_curator() {
// Verify updated child-bounty status.
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -935,7 +938,7 @@ fn child_bounty_active_unassign_curator() {
let expected_child_deposit = CuratorDepositMin::get();
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -963,7 +966,7 @@ fn child_bounty_active_unassign_curator() {
// Verify updated child-bounty status.
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -1025,7 +1028,7 @@ fn parent_bounty_inactive_unassign_curator_child_bounty() {
let expected_child_deposit = CuratorDepositMultiplier::get() * fee;
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -1056,7 +1059,7 @@ fn parent_bounty_inactive_unassign_curator_child_bounty() {
// Verify updated child-bounty status.
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -1087,7 +1090,7 @@ fn parent_bounty_inactive_unassign_curator_child_bounty() {
let expected_deposit = CuratorDepositMin::get();
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -1116,7 +1119,7 @@ fn parent_bounty_inactive_unassign_curator_child_bounty() {
// Verify updated child-bounty status.
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -1186,7 +1189,7 @@ fn close_parent_with_child_bounty() {
assert_ok!(ChildBounties::close_child_bounty(RuntimeOrigin::root(), 0, 0));
// Check the child-bounty count.
- assert_eq!(ChildBounties::parent_child_bounties(0), 0);
+ assert_eq!(pallet_child_bounties::ParentChildBounties::<Test>::get(0), 0);
// Try close parent-bounty again.
// Should pass this time.
@@ -1235,7 +1238,7 @@ fn children_curator_fee_calculation_test() {
// Propose curator for child-bounty.
assert_ok!(ChildBounties::propose_curator(RuntimeOrigin::signed(4), 0, 0, 8, fee));
// Check curator fee added to the sum.
- assert_eq!(ChildBounties::children_curator_fees(0), fee);
+ assert_eq!(pallet_child_bounties::ChildrenCuratorFees::<Test>::get(0), fee);
// Accept curator for child-bounty.
assert_ok!(ChildBounties::accept_curator(RuntimeOrigin::signed(8), 0, 0));
// Award child-bounty.
@@ -1244,7 +1247,7 @@ fn children_curator_fee_calculation_test() {
let expected_child_deposit = CuratorDepositMultiplier::get() * fee;
assert_eq!(
- ChildBounties::child_bounties(0, 0).unwrap(),
+ pallet_child_bounties::ChildBounties::<Test>::get(0, 0).unwrap(),
ChildBounty {
parent_bounty: 0,
value: 10,
@@ -1264,7 +1267,7 @@ fn children_curator_fee_calculation_test() {
assert_ok!(ChildBounties::claim_child_bounty(RuntimeOrigin::signed(7), 0, 0));
// Check the child-bounty count.
- assert_eq!(ChildBounties::parent_child_bounties(0), 0);
+ assert_eq!(pallet_child_bounties::ParentChildBounties::<Test>::get(0), 0);
// Award the parent bounty.
assert_ok!(Bounties::award_bounty(RuntimeOrigin::signed(4), 0, 9));