pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-15 17:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional zero bid logic for Society pallet (#4604)

Browse Source 
* Select only one zero bid, better ordering of new bids

* Select zero bid as head

* Update comment

* Update frame/society/src/tests.rs

* Add new test, logic not updated yet

* Implement `put_bid` to order same value bids

Note that this extra logic currently does not do anything per the implementation of `binary_search` in Rust.
This commit is contained in:
Shawn Tabrizi
2020-01-13 19:00:04 +01:00
committed by Gavin Wood
parent d16d57884a
commit 5c0bdd339f
2 changed files with 147 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/society/src/tests.rs
+65
View File
@@ -742,3 +742,68 @@ fn max_limits_work() {
assert_eq!(Society::candidates().len(), 10);
});
}
#[test]
fn zero_bid_works() {
// This tests:
// * Only one zero bid is selected.
// * That zero bid is placed as head when accepted.
EnvBuilder::new().execute(|| {
// Users make bids of various amounts
assert_ok!(Society::bid(Origin::signed(60), 400));
assert_ok!(Society::bid(Origin::signed(50), 300));
assert_ok!(Society::bid(Origin::signed(30), 0));
assert_ok!(Society::bid(Origin::signed(20), 0));
assert_ok!(Society::bid(Origin::signed(40), 0));
// Rotate period
run_to_block(4);
// Pot is 1000 after "PeriodSpend"
assert_eq!(Society::pot(), 1000);
assert_eq!(Balances::free_balance(Society::account_id()), 10_000);
// Choose smallest bidding users whose total is less than pot, with only one zero bid.
assert_eq!(Society::candidates(), vec![
create_bid(0, 30, BidKind::Deposit(25)),
create_bid(300, 50, BidKind::Deposit(25)),
create_bid(400, 60, BidKind::Deposit(25)),
]);
assert_eq!(<Bids<Test>>::get(), vec![
create_bid(0, 20, BidKind::Deposit(25)),
create_bid(0, 40, BidKind::Deposit(25)),
]);
// A member votes for these candidates to join the society
assert_ok!(Society::vote(Origin::signed(10), 30, true));
assert_ok!(Society::vote(Origin::signed(10), 50, true));
assert_ok!(Society::vote(Origin::signed(10), 60, true));
run_to_block(8);
// Candidates become members after a period rotation
assert_eq!(Society::members(), vec![10, 30, 50, 60]);
// The zero bid is selected as head
assert_eq!(Society::head(), Some(30));
});
}
#[test]
fn bids_ordered_correctly() {
// This tests that bids with the same value are placed in the list ordered
// with bidders who bid first earlier on the list.
EnvBuilder::new().execute(|| {
for i in 0..5 {
for j in 0..5 {
// Give them some funds
let _ = Balances::make_free_balance_be(&(100 + (i * 5 + j) as u128), 1000);
assert_ok!(Society::bid(Origin::signed(100 + (i * 5 + j) as u128), j));
}
}
let mut final_list = Vec::new();
for j in 0..5 {
for i in 0..5 {
final_list.push(create_bid(j, 100 + (i * 5 + j) as u128, BidKind::Deposit(25)));
}
}
assert_eq!(<Bids<Test>>::get(), final_list);
});
}