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

Jump to bottom

Feature/plmc 238 add settlement period to automatic acceptance #65

Merged
merged 3 commits into from
Aug 14, 2023
Merged

Feature/plmc 238 add settlement period to automatic acceptance #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27d29dc
fix(238): add time to settlement period to automatic acceptance
JuaniRios Aug 10, 2023
b4d495f
fix(238): fmt
JuaniRios Aug 10, 2023
233c5e7
fix(238): test fix
JuaniRios Aug 10, 2023
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
2 changes: 1 addition & 1 deletion pallets/funding/src/functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ impl<T: Config> Pallet<T> {
project_id,
project_details,
SuccessReason::ReachedTarget,
1u32.into(),
T::SuccessToSettlementTime::get(),
)
}
}
Expand Down
50 changes: 33 additions & 17 deletions pallets/funding/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,6 +1878,8 @@

community_funding_project.buy_for_retail_users(contributions).unwrap();
let finished_project = community_funding_project.finish_funding();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(10).unwrap();
let project_id = finished_project.project_id;
let actual_reward_balances = test_env.in_ext(|| {
Expand Down Expand Up @@ -1922,6 +1924,8 @@
let prev_free_plmc = test_env.get_free_plmc_balances_for(evaluators.clone());

remainder_funding_project.end_funding();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(10).unwrap();
let post_unbond_amounts: UserToPLMCBalance =
prev_reserved_plmc.iter().map(|(evaluator, _amount)| (*evaluator, Zero::zero())).collect();
Expand Down Expand Up @@ -2466,7 +2470,7 @@
let details = finished_project.get_project_details();
assert_eq!(details.status, ProjectStatus::FundingSuccessful);
assert_eq!(details.cleanup, Cleaner::NotReady);

test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();
test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Finished(PhantomData)));
Expand Down Expand Up @@ -2528,7 +2532,7 @@
);
})
}
test_env.advance_time(1u64).unwrap();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Initialized(PhantomData)));

Expand Down Expand Up @@ -2586,7 +2590,7 @@
let stored_bids =
test_env.in_ext(|| Bids::<TestRuntime>::iter_prefix_values((project_id,)).collect::<Vec<_>>());

test_env.advance_time(1u64).unwrap();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Initialized(PhantomData)));

Expand Down Expand Up @@ -2637,7 +2641,8 @@
assert_eq!(details.status, ProjectStatus::FundingSuccessful);
assert_eq!(details.cleanup, Cleaner::NotReady);

test_env.advance_time(10u64).unwrap();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();
test_env.advance_time(10u64.into()).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Finished(PhantomData)));

Expand Down Expand Up @@ -2700,7 +2705,7 @@
community_contributions,
remainder_contributions,
);

test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();
test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Finished(PhantomData)));
Expand Down Expand Up @@ -2743,8 +2748,7 @@
let details = finished_project.get_project_details();
assert_eq!(details.status, ProjectStatus::FundingSuccessful);
assert_eq!(details.cleanup, Cleaner::NotReady);

test_env.advance_time(1u64).unwrap();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Initialized(PhantomData)));

Expand Down Expand Up @@ -2793,6 +2797,7 @@
community_contributions,
remainder_contributions,
);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
Expand Down Expand Up @@ -2843,7 +2848,7 @@
community_contributions,
remainder_contributions,
);

test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();
test_env.advance_time(15u64).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Finished(PhantomData)));
Expand Down Expand Up @@ -2898,7 +2903,7 @@

let auctioning_project = AuctioningProject::new_with(&test_env, project, issuer, evaluations);
let mut bidders_plmc = calculate_auction_plmc_spent(bids.clone());
bidders_plmc.iter_mut().for_each(|(acc, amount)| *amount += get_ed());

Check warning on line 2906 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

unused variable: `acc`
test_env.mint_plmc_to(bidders_plmc.clone());

let bidders_funding_assets = calculate_auction_funding_asset_spent(bids.clone());
Expand All @@ -2909,7 +2914,7 @@
let community_funding_project = auctioning_project.start_community_funding();
let final_price = community_funding_project.get_project_details().weighted_average_price.unwrap();
let mut contributors_plmc = calculate_contributed_plmc_spent(community_contributions.clone(), final_price);
contributors_plmc.iter_mut().for_each(|(acc, amount)| *amount += get_ed());

Check warning on line 2917 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

unused variable: `acc`
test_env.mint_plmc_to(contributors_plmc.clone());

let contributors_funding_assets =
Expand All @@ -2919,7 +2924,7 @@
community_funding_project.buy_for_retail_users(community_contributions).unwrap();
let finished_project = community_funding_project.finish_funding();

test_env.advance_time(10u64).unwrap();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get() + 1).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Finished(PhantomData)));

Expand Down Expand Up @@ -3400,10 +3405,10 @@
assert_eq!(community_funding_project.get_project_details().status, ProjectStatus::FundingSuccessful);

let reserved_plmc = plmc_fundings.swap_remove(0).1;
let remaining_plmc: Balance = plmc_fundings.iter().fold(0_u128, |acc, (_, amount)| acc + amount);

Check warning on line 3408 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

`Balance` is ambiguous

let actual_funding_transferred = statemint_asset_fundings.swap_remove(0).1;
let remaining_statemint_assets: Balance =

Check warning on line 3411 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

`Balance` is ambiguous
statemint_asset_fundings.iter().fold(0_u128, |acc, (_, amount, _)| acc + amount);

test_env.do_free_plmc_assertions(vec![(BOB, remaining_plmc)]);
Expand Down Expand Up @@ -3811,7 +3816,7 @@
let details = finished_project.get_project_details();
assert_eq!(details.status, ProjectStatus::FundingSuccessful);
assert_eq!(details.cleanup, Cleaner::NotReady);

test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();
test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Finished(PhantomData)));
Expand Down Expand Up @@ -3873,7 +3878,8 @@
);
})
}
test_env.advance_time(1u64).unwrap();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Initialized(PhantomData)));

Expand Down Expand Up @@ -3930,8 +3936,8 @@
assert_eq!(details.cleanup, Cleaner::NotReady);
let stored_contributions =
test_env.in_ext(|| Contributions::<TestRuntime>::iter_prefix_values((project_id,)).collect::<Vec<_>>());
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(1u64).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Initialized(PhantomData)));

Expand Down Expand Up @@ -3981,6 +3987,7 @@
let details = finished_project.get_project_details();
assert_eq!(details.status, ProjectStatus::FundingSuccessful);
assert_eq!(details.cleanup, Cleaner::NotReady);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
Expand Down Expand Up @@ -4040,7 +4047,7 @@

let price = finished_project.get_project_details().weighted_average_price.unwrap();
let contribution_locked_plmc = calculate_contributed_plmc_spent(community_contributions, price);

test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();
test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Finished(PhantomData)));
Expand Down Expand Up @@ -4080,8 +4087,8 @@
let details = finished_project.get_project_details();
assert_eq!(details.status, ProjectStatus::FundingSuccessful);
assert_eq!(details.cleanup, Cleaner::NotReady);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(1u64).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Initialized(PhantomData)));

Expand Down Expand Up @@ -4137,6 +4144,7 @@
community_contributions,
remainder_contributions,
);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
Expand Down Expand Up @@ -4190,6 +4198,7 @@
community_contributions,
remainder_contributions,
);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(15u64).unwrap();
let details = finished_project.get_project_details();
Expand Down Expand Up @@ -4439,10 +4448,10 @@
assert_eq!(remainder_funding_project.get_project_details().status, ProjectStatus::FundingSuccessful);

let reserved_plmc = plmc_fundings.swap_remove(0).1;
let remaining_plmc: Balance = plmc_fundings.iter().fold(0_u128, |acc, (_, amount)| acc + amount);

Check warning on line 4451 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

`Balance` is ambiguous

let actual_funding_transferred = statemint_asset_fundings.swap_remove(0).1;
let remaining_statemint_assets: Balance =

Check warning on line 4454 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

`Balance` is ambiguous
statemint_asset_fundings.iter().fold(0_u128, |acc, (_, amount, _)| acc + amount);

test_env.do_free_plmc_assertions(vec![(BOB, remaining_plmc)]);
Expand Down Expand Up @@ -4493,6 +4502,7 @@
let details = finished_project.get_project_details();
assert_eq!(details.status, ProjectStatus::FundingSuccessful);
assert_eq!(details.cleanup, Cleaner::NotReady);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
Expand Down Expand Up @@ -4575,7 +4585,8 @@
);
})
}
test_env.advance_time(1u64).unwrap();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Initialized(PhantomData)));

Expand Down Expand Up @@ -4672,7 +4683,8 @@
);
})
}
test_env.advance_time(1u64).unwrap();
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Initialized(PhantomData)));

Expand Down Expand Up @@ -4766,6 +4778,7 @@
Contributions::<TestRuntime>::iter_prefix_values((project_id, BIDDER_1)).next().unwrap();
vec![evaluator_contribution.clone(), buyer_contribution.clone(), bidder_contribution.clone()]
});
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
Expand Down Expand Up @@ -4830,6 +4843,7 @@
let remainder_locked_plmc = calculate_contributed_plmc_spent(remainder_contributions, price);
let all_plmc_locks =
merge_add_mappings_by_user(vec![auction_locked_plmc, community_locked_plmc, remainder_locked_plmc]);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
Expand Down Expand Up @@ -4870,8 +4884,8 @@
let details = finished_project.get_project_details();
assert_eq!(details.status, ProjectStatus::FundingSuccessful);
assert_eq!(details.cleanup, Cleaner::NotReady);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(1u64).unwrap();
let details = finished_project.get_project_details();
assert_eq!(details.cleanup, Cleaner::Success(CleanerState::Initialized(PhantomData)));

Expand Down Expand Up @@ -4940,6 +4954,7 @@
community_contributions,
remainder_contributions,
);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(10u64).unwrap();
let details = finished_project.get_project_details();
Expand All @@ -4960,9 +4975,9 @@

let merged_plmc_balances = generic_map_merge_reduce(
vec![contributed_plmc_balances.clone(), bid_plmc_balances.clone()],
|(account, amount)| account.clone(),

Check warning on line 4978 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

unused variable: `amount`
BalanceOf::<TestRuntime>::zero(),
|(account, amount), total| total + amount,

Check warning on line 4980 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

unused variable: `account`
);
test_env.advance_time((1 * DAYS + 1u32).into()).unwrap();

Expand Down Expand Up @@ -5002,6 +5017,7 @@
community_contributions,
remainder_contributions,
);
test_env.advance_time(<TestRuntime as Config>::SuccessToSettlementTime::get()).unwrap();

test_env.advance_time(15u64).unwrap();
let details = finished_project.get_project_details();
Expand All @@ -5028,9 +5044,9 @@

let merged_plmc_balances = generic_map_merge_reduce(
vec![contributed_plmc_balances.clone(), bid_plmc_balances.clone()],
|(account, amount)| account.clone(),

Check warning on line 5047 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

unused variable: `amount`
BalanceOf::<TestRuntime>::zero(),
|(account, amount), total| total + amount,

Check warning on line 5049 in pallets/funding/src/tests.rs

View workflow job for this annotation

GitHub Actions / test 

unused variable: `account`
);

for (contributor, amount) in merged_plmc_balances {
Expand Down