Skip to content

Commit 1837fdd

Browse files
chungquantinchungquantin
authored
Merge pull request #3 from openguild-labs/chungquantin/deprecated_treasury_in_bounties-_pallet
Update deprecated treasury pallet code in the `bounty`, `tip` and `child_bounties`
2 parents 40518af + fb2afc2 commit 1837fdd

6 files changed

Lines changed: 32 additions & 312 deletions

File tree

‎cumulus/parachains/runtimes/collectives/collectives-westend/src/weights/pallet_treasury.rs‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -62,43 +62,6 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
6262
.saturating_add(T::DbWeight::get().reads(2))
6363
.saturating_add(T::DbWeight::get().writes(3))
6464
}
65-
/// Storage: `FellowshipTreasury::ProposalCount` (r:1 w:1)
66-
/// Proof: `FellowshipTreasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
67-
/// Storage: `FellowshipTreasury::Proposals` (r:0 w:1)
68-
/// Proof: `FellowshipTreasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
69-
fn propose_spend() -> Weight {
70-
// Proof Size summary in bytes:
71-
// Measured: `143`
72-
// Estimated: `1489`
73-
// Minimum execution time: 264_000_000 picoseconds.
74-
Weight::from_parts(277_000_000, 0)
75-
.saturating_add(Weight::from_parts(0, 1489))
76-
.saturating_add(T::DbWeight::get().reads(1))
77-
.saturating_add(T::DbWeight::get().writes(2))
78-
}
79-
/// Storage: `FellowshipTreasury::Proposals` (r:1 w:1)
80-
/// Proof: `FellowshipTreasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
81-
/// Storage: `System::Account` (r:1 w:1)
82-
/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
83-
fn reject_proposal() -> Weight {
84-
// Proof Size summary in bytes:
85-
// Measured: `301`
86-
// Estimated: `3593`
87-
// Minimum execution time: 289_000_000 picoseconds.
88-
Weight::from_parts(312_000_000, 0)
89-
.saturating_add(Weight::from_parts(0, 3593))
90-
.saturating_add(T::DbWeight::get().reads(2))
91-
.saturating_add(T::DbWeight::get().writes(2))
92-
}
93-
/// The range of component `p` is `[0, 99]`.
94-
fn approve_proposal(_p: u32, ) -> Weight {
95-
// Proof Size summary in bytes:
96-
// Measured: `0`
97-
// Estimated: `0`
98-
// Minimum execution time: 0_000 picoseconds.
99-
Weight::from_parts(0, 0)
100-
.saturating_add(Weight::from_parts(0, 0))
101-
}
10265
/// Storage: `FellowshipTreasury::Approvals` (r:1 w:1)
10366
/// Proof: `FellowshipTreasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
10467
fn remove_approval() -> Weight {

‎polkadot/runtime/rococo/src/weights/pallet_treasury.rs‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -63,51 +63,6 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
6363
.saturating_add(T::DbWeight::get().reads(2))
6464
.saturating_add(T::DbWeight::get().writes(3))
6565
}
66-
/// Storage: Treasury ProposalCount (r:1 w:1)
67-
/// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
68-
/// Storage: Treasury Proposals (r:0 w:1)
69-
/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
70-
fn propose_spend() -> Weight {
71-
// Proof Size summary in bytes:
72-
// Measured: `143`
73-
// Estimated: `1489`
74-
// Minimum execution time: 354_000_000 picoseconds.
75-
Weight::from_parts(376_000_000, 0)
76-
.saturating_add(Weight::from_parts(0, 1489))
77-
.saturating_add(T::DbWeight::get().reads(1))
78-
.saturating_add(T::DbWeight::get().writes(2))
79-
}
80-
/// Storage: Treasury Proposals (r:1 w:1)
81-
/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
82-
/// Storage: System Account (r:1 w:1)
83-
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
84-
fn reject_proposal() -> Weight {
85-
// Proof Size summary in bytes:
86-
// Measured: `301`
87-
// Estimated: `3593`
88-
// Minimum execution time: 547_000_000 picoseconds.
89-
Weight::from_parts(550_000_000, 0)
90-
.saturating_add(Weight::from_parts(0, 3593))
91-
.saturating_add(T::DbWeight::get().reads(2))
92-
.saturating_add(T::DbWeight::get().writes(2))
93-
}
94-
/// Storage: Treasury Proposals (r:1 w:0)
95-
/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
96-
/// Storage: Treasury Approvals (r:1 w:1)
97-
/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
98-
/// The range of component `p` is `[0, 99]`.
99-
fn approve_proposal(p: u32, ) -> Weight {
100-
// Proof Size summary in bytes:
101-
// Measured: `470 + p * (8 ±0)`
102-
// Estimated: `3573`
103-
// Minimum execution time: 104_000_000 picoseconds.
104-
Weight::from_parts(121_184_402, 0)
105-
.saturating_add(Weight::from_parts(0, 3573))
106-
// Standard Error: 42_854
107-
.saturating_add(Weight::from_parts(153_112, 0).saturating_mul(p.into()))
108-
.saturating_add(T::DbWeight::get().reads(2))
109-
.saturating_add(T::DbWeight::get().writes(1))
110-
}
11166
/// Storage: Treasury Approvals (r:1 w:1)
11267
/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
11368
fn remove_approval() -> Weight {

‎polkadot/runtime/westend/src/weights/pallet_treasury.rs‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -63,51 +63,6 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
6363
.saturating_add(T::DbWeight::get().reads(2))
6464
.saturating_add(T::DbWeight::get().writes(3))
6565
}
66-
/// Storage: Treasury ProposalCount (r:1 w:1)
67-
/// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
68-
/// Storage: Treasury Proposals (r:0 w:1)
69-
/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
70-
fn propose_spend() -> Weight {
71-
// Proof Size summary in bytes:
72-
// Measured: `143`
73-
// Estimated: `1489`
74-
// Minimum execution time: 354_000_000 picoseconds.
75-
Weight::from_parts(376_000_000, 0)
76-
.saturating_add(Weight::from_parts(0, 1489))
77-
.saturating_add(T::DbWeight::get().reads(1))
78-
.saturating_add(T::DbWeight::get().writes(2))
79-
}
80-
/// Storage: Treasury Proposals (r:1 w:1)
81-
/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
82-
/// Storage: System Account (r:1 w:1)
83-
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
84-
fn reject_proposal() -> Weight {
85-
// Proof Size summary in bytes:
86-
// Measured: `301`
87-
// Estimated: `3593`
88-
// Minimum execution time: 547_000_000 picoseconds.
89-
Weight::from_parts(550_000_000, 0)
90-
.saturating_add(Weight::from_parts(0, 3593))
91-
.saturating_add(T::DbWeight::get().reads(2))
92-
.saturating_add(T::DbWeight::get().writes(2))
93-
}
94-
/// Storage: Treasury Proposals (r:1 w:0)
95-
/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
96-
/// Storage: Treasury Approvals (r:1 w:1)
97-
/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
98-
/// The range of component `p` is `[0, 99]`.
99-
fn approve_proposal(p: u32, ) -> Weight {
100-
// Proof Size summary in bytes:
101-
// Measured: `470 + p * (8 ±0)`
102-
// Estimated: `3573`
103-
// Minimum execution time: 104_000_000 picoseconds.
104-
Weight::from_parts(121_184_402, 0)
105-
.saturating_add(Weight::from_parts(0, 3573))
106-
// Standard Error: 42_854
107-
.saturating_add(Weight::from_parts(153_112, 0).saturating_mul(p.into()))
108-
.saturating_add(T::DbWeight::get().reads(2))
109-
.saturating_add(T::DbWeight::get().writes(1))
110-
}
11166
/// Storage: Treasury Approvals (r:1 w:1)
11267
/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
11368
fn remove_approval() -> Weight {

‎substrate/frame/bounties/src/tests.rs‎

Lines changed: 7 additions & 185 deletions
Original file line numberDiff line numberDiff line change
@@ -227,56 +227,12 @@ fn minting_works() {
227227
});
228228
}
229229

230-
#[test]
231-
fn spend_proposal_takes_min_deposit() {
232-
new_test_ext().execute_with(|| {
233-
assert_ok!({
234-
#[allow(deprecated)]
235-
Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3)
236-
});
237-
assert_eq!(Balances::free_balance(0), 99);
238-
assert_eq!(Balances::reserved_balance(0), 1);
239-
});
240-
}
241-
242-
#[test]
243-
fn spend_proposal_takes_proportional_deposit() {
244-
new_test_ext().execute_with(|| {
245-
assert_ok!({
246-
#[allow(deprecated)]
247-
Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)
248-
});
249-
assert_eq!(Balances::free_balance(0), 95);
250-
assert_eq!(Balances::reserved_balance(0), 5);
251-
});
252-
}
253-
254-
#[test]
255-
fn spend_proposal_fails_when_proposer_poor() {
256-
new_test_ext().execute_with(|| {
257-
assert_noop!(
258-
{
259-
#[allow(deprecated)]
260-
Treasury::propose_spend(RuntimeOrigin::signed(2), 100, 3)
261-
},
262-
TreasuryError::InsufficientProposersBalance,
263-
);
264-
});
265-
}
266-
267230
#[test]
268231
fn accepted_spend_proposal_ignored_outside_spend_period() {
269232
new_test_ext().execute_with(|| {
270233
Balances::make_free_balance_be(&Treasury::account_id(), 101);
271234

272-
assert_ok!({
273-
#[allow(deprecated)]
274-
Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)
275-
});
276-
assert_ok!({
277-
#[allow(deprecated)]
278-
Treasury::approve_proposal(RuntimeOrigin::root(), 0)
279-
});
235+
assert_ok!({ Treasury::spend_local(RuntimeOrigin::root(), 100, 3) });
280236

281237
<Treasury as OnInitialize<u64>>::on_initialize(1);
282238
assert_eq!(Balances::free_balance(3), 0);
@@ -297,112 +253,13 @@ fn unused_pot_should_diminish() {
297253
});
298254
}
299255

300-
#[test]
301-
fn rejected_spend_proposal_ignored_on_spend_period() {
302-
new_test_ext().execute_with(|| {
303-
Balances::make_free_balance_be(&Treasury::account_id(), 101);
304-
305-
assert_ok!({
306-
#[allow(deprecated)]
307-
Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)
308-
});
309-
assert_ok!({
310-
#[allow(deprecated)]
311-
Treasury::reject_proposal(RuntimeOrigin::root(), 0)
312-
});
313-
314-
<Treasury as OnInitialize<u64>>::on_initialize(2);
315-
assert_eq!(Balances::free_balance(3), 0);
316-
assert_eq!(Treasury::pot(), 50);
317-
});
318-
}
319-
320-
#[test]
321-
fn reject_already_rejected_spend_proposal_fails() {
322-
new_test_ext().execute_with(|| {
323-
Balances::make_free_balance_be(&Treasury::account_id(), 101);
324-
325-
assert_ok!({
326-
#[allow(deprecated)]
327-
Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)
328-
});
329-
assert_ok!({
330-
#[allow(deprecated)]
331-
Treasury::reject_proposal(RuntimeOrigin::root(), 0)
332-
});
333-
assert_noop!(
334-
{
335-
#[allow(deprecated)]
336-
Treasury::reject_proposal(RuntimeOrigin::root(), 0)
337-
},
338-
TreasuryError::InvalidIndex
339-
);
340-
});
341-
}
342-
343-
#[test]
344-
fn reject_non_existent_spend_proposal_fails() {
345-
new_test_ext().execute_with(|| {
346-
assert_noop!(
347-
{
348-
#[allow(deprecated)]
349-
Treasury::reject_proposal(RuntimeOrigin::root(), 0)
350-
},
351-
pallet_treasury::Error::<Test>::InvalidIndex
352-
);
353-
});
354-
}
355-
356-
#[test]
357-
fn accept_non_existent_spend_proposal_fails() {
358-
new_test_ext().execute_with(|| {
359-
assert_noop!(
360-
{
361-
#[allow(deprecated)]
362-
Treasury::approve_proposal(RuntimeOrigin::root(), 0)
363-
},
364-
TreasuryError::InvalidIndex
365-
);
366-
});
367-
}
368-
369-
#[test]
370-
fn accept_already_rejected_spend_proposal_fails() {
371-
new_test_ext().execute_with(|| {
372-
Balances::make_free_balance_be(&Treasury::account_id(), 101);
373-
374-
assert_ok!({
375-
#[allow(deprecated)]
376-
Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)
377-
});
378-
assert_ok!({
379-
#[allow(deprecated)]
380-
Treasury::reject_proposal(RuntimeOrigin::root(), 0)
381-
});
382-
assert_noop!(
383-
{
384-
#[allow(deprecated)]
385-
Treasury::approve_proposal(RuntimeOrigin::root(), 0)
386-
},
387-
TreasuryError::InvalidIndex
388-
);
389-
});
390-
}
391-
392256
#[test]
393257
fn accepted_spend_proposal_enacted_on_spend_period() {
394258
new_test_ext().execute_with(|| {
395259
Balances::make_free_balance_be(&Treasury::account_id(), 101);
396260
assert_eq!(Treasury::pot(), 100);
397261

398-
assert_ok!({
399-
#[allow(deprecated)]
400-
Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)
401-
});
402-
assert_ok!({
403-
#[allow(deprecated)]
404-
Treasury::approve_proposal(RuntimeOrigin::root(), 0)
405-
});
262+
assert_ok!({ Treasury::spend_local(RuntimeOrigin::root(), 100, 3) });
406263

407264
<Treasury as OnInitialize<u64>>::on_initialize(2);
408265
assert_eq!(Balances::free_balance(3), 100);
@@ -416,14 +273,7 @@ fn pot_underflow_should_not_diminish() {
416273
Balances::make_free_balance_be(&Treasury::account_id(), 101);
417274
assert_eq!(Treasury::pot(), 100);
418275

419-
assert_ok!({
420-
#[allow(deprecated)]
421-
Treasury::propose_spend(RuntimeOrigin::signed(0), 150, 3)
422-
});
423-
assert_ok!({
424-
#[allow(deprecated)]
425-
Treasury::approve_proposal(RuntimeOrigin::root(), 0)
426-
});
276+
assert_ok!({ Treasury::spend_local(RuntimeOrigin::root(), 150, 3) });
427277

428278
<Treasury as OnInitialize<u64>>::on_initialize(2);
429279
assert_eq!(Treasury::pot(), 100); // Pot hasn't changed
@@ -444,26 +294,12 @@ fn treasury_account_doesnt_get_deleted() {
444294
assert_eq!(Treasury::pot(), 100);
445295
let treasury_balance = Balances::free_balance(&Treasury::account_id());
446296

447-
assert_ok!({
448-
#[allow(deprecated)]
449-
Treasury::propose_spend(RuntimeOrigin::signed(0), treasury_balance, 3)
450-
});
451-
assert_ok!({
452-
#[allow(deprecated)]
453-
Treasury::approve_proposal(RuntimeOrigin::root(), 0)
454-
});
297+
assert_ok!({ Treasury::spend_local(RuntimeOrigin::root(), treasury_balance, 3) });
455298

456299
<Treasury as OnInitialize<u64>>::on_initialize(2);
457300
assert_eq!(Treasury::pot(), 100); // Pot hasn't changed
458301

459-
assert_ok!({
460-
#[allow(deprecated)]
461-
Treasury::propose_spend(RuntimeOrigin::signed(0), Treasury::pot(), 3)
462-
});
463-
assert_ok!({
464-
#[allow(deprecated)]
465-
Treasury::approve_proposal(RuntimeOrigin::root(), 1)
466-
});
302+
assert_ok!({ Treasury::spend_local(RuntimeOrigin::root(), Treasury::pot(), 3) });
467303

468304
<Treasury as OnInitialize<u64>>::on_initialize(4);
469305
assert_eq!(Treasury::pot(), 0); // Pot is emptied
@@ -486,22 +322,8 @@ fn inexistent_account_works() {
486322
assert_eq!(Balances::free_balance(Treasury::account_id()), 0); // Account does not exist
487323
assert_eq!(Treasury::pot(), 0); // Pot is empty
488324

489-
assert_ok!({
490-
#[allow(deprecated)]
491-
Treasury::propose_spend(RuntimeOrigin::signed(0), 99, 3)
492-
});
493-
assert_ok!({
494-
#[allow(deprecated)]
495-
Treasury::approve_proposal(RuntimeOrigin::root(), 0)
496-
});
497-
assert_ok!({
498-
#[allow(deprecated)]
499-
Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3)
500-
});
501-
assert_ok!({
502-
#[allow(deprecated)]
503-
Treasury::approve_proposal(RuntimeOrigin::root(), 1)
504-
});
325+
assert_ok!({ Treasury::spend_local(RuntimeOrigin::root(), 99, 3) });
326+
assert_ok!({ Treasury::spend_local(RuntimeOrigin::root(), 1, 3) });
505327
<Treasury as OnInitialize<u64>>::on_initialize(2);
506328
assert_eq!(Treasury::pot(), 0); // Pot hasn't changed
507329
assert_eq!(Balances::free_balance(3), 0); // Balance of `3` hasn't changed

0 commit comments

Comments
 (0)