Skip to content

Commit

Permalink
Fix tests (#284)
Browse files Browse the repository at this point in the history 
## What?
- Fixes all the existing tests from #283
  • Loading branch information
@JuaniRios
JuaniRios authored May 6, 2024
1 parent 010cfee commit d4124c0
Show file tree
Hide file tree
Showing 9 changed files with 114 additions and 122 deletions.
10 changes: 5 additions & 5 deletions integration-tests/src/tests/defaults.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ pub fn default_project_metadata(issuer: AccountId) -> ProjectMetadataOf<politest
)
.unwrap(),
bidding_ticket_sizes: BiddingTicketSizes {
professional: TicketSize::new(Some(5000 * USD_UNIT), None),
institutional: TicketSize::new(Some(5000 * USD_UNIT), None),
professional: TicketSize::new(5000 * USD_UNIT, None),
institutional: TicketSize::new(5000 * USD_UNIT, None),
phantom: Default::default(),
},
contributing_ticket_sizes: ContributingTicketSizes {
retail: TicketSize::new(None, None),
professional: TicketSize::new(None, None),
institutional: TicketSize::new(None, None),
retail: TicketSize::new(USD_UNIT, None),
professional: TicketSize::new(USD_UNIT, None),
institutional: TicketSize::new(USD_UNIT, None),
phantom: Default::default(),
},
participation_currencies: vec![AcceptedFundingAsset::USDT].try_into().unwrap(),
Expand Down
10 changes: 5 additions & 5 deletions integration-tests/src/tests/e2e.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ pub fn excel_project() -> ProjectMetadataOf<PolitestRuntime> {
)
.unwrap(),
bidding_ticket_sizes: BiddingTicketSizes {
professional: TicketSize::new(Some(5000 * USD_UNIT), None),
institutional: TicketSize::new(Some(5000 * USD_UNIT), None),
professional: TicketSize::new(5000 * USD_UNIT, None),
institutional: TicketSize::new(5000 * USD_UNIT, None),
phantom: Default::default(),
},
contributing_ticket_sizes: ContributingTicketSizes {
retail: TicketSize::new(None, None),
professional: TicketSize::new(None, None),
institutional: TicketSize::new(None, None),
retail: TicketSize::new(USD_UNIT, None),
professional: TicketSize::new(USD_UNIT, None),
institutional: TicketSize::new(USD_UNIT, None),
phantom: Default::default(),
},
participation_currencies: vec![AcceptedFundingAsset::USDT].try_into().unwrap(),
Expand Down
73 changes: 33 additions & 40 deletions pallets/funding/src/benchmarking.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,28 @@ where

bidding_ticket_sizes: BiddingTicketSizes {
professional: TicketSize::new(
Some(
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
institutional: TicketSize::new(
Some(
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
phantom: Default::default(),
},
contributing_ticket_sizes: ContributingTicketSizes {
retail: TicketSize::new(None, None),
professional: TicketSize::new(None, None),
institutional: TicketSize::new(None, None),
retail: TicketSize::new(
BalanceOf::<T>::try_from(USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
professional: TicketSize::new(
BalanceOf::<T>::try_from(USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
institutional: TicketSize::new(
BalanceOf::<T>::try_from(USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
phantom: Default::default(),
},
participation_currencies: vec![AcceptedFundingAsset::USDT].try_into().unwrap(),
Expand Down Expand Up @@ -481,20 +486,14 @@ mod benchmarks {
.unwrap(),
bidding_ticket_sizes: BiddingTicketSizes {
professional: TicketSize::new(
Some(
BalanceOf::<T>::try_from(5000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
Some(
BalanceOf::<T>::try_from(10_000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
),
institutional: TicketSize::new(
Some(
BalanceOf::<T>::try_from(5000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
Some(
BalanceOf::<T>::try_from(10_000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
Expand All @@ -504,30 +503,21 @@ mod benchmarks {
},
contributing_ticket_sizes: ContributingTicketSizes {
retail: TicketSize::new(
Some(
BalanceOf::<T>::try_from(5000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
Some(
BalanceOf::<T>::try_from(10_000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
),
professional: TicketSize::new(
Some(
BalanceOf::<T>::try_from(5000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
Some(
BalanceOf::<T>::try_from(10_000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
),
institutional: TicketSize::new(
Some(
BalanceOf::<T>::try_from(5000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
Some(
BalanceOf::<T>::try_from(10_000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
Expand Down Expand Up @@ -2044,25 +2034,28 @@ mod benchmarks {
.unwrap(),
bidding_ticket_sizes: BiddingTicketSizes {
professional: TicketSize::new(
Some(
BalanceOf::<T>::try_from(5000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
institutional: TicketSize::new(
Some(
BalanceOf::<T>::try_from(5000 * USD_UNIT)
.unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
),
BalanceOf::<T>::try_from(5000 * USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
phantom: Default::default(),
},
contributing_ticket_sizes: ContributingTicketSizes {
retail: TicketSize::new(None, None),
professional: TicketSize::new(None, None),
institutional: TicketSize::new(None, None),
retail: TicketSize::new(
BalanceOf::<T>::try_from(USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
professional: TicketSize::new(
BalanceOf::<T>::try_from(USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
institutional: TicketSize::new(
BalanceOf::<T>::try_from(USD_UNIT).unwrap_or_else(|_| panic!("Failed to create BalanceOf")),
None,
),
phantom: Default::default(),
},
participation_currencies: vec![AcceptedFundingAsset::USDT].try_into().unwrap(),
Expand Down
27 changes: 13 additions & 14 deletions pallets/funding/src/tests/1_application.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,27 +382,26 @@ mod create_project_extrinsic {

// min in bidding below 5k
let mut wrong_project_1 = correct_project.clone();
wrong_project_1.bidding_ticket_sizes.professional = TicketSize::new(Some(4999 * USD_UNIT), None);
wrong_project_1.bidding_ticket_sizes.professional = TicketSize::new(4999 * USD_UNIT, None);

let mut wrong_project_2 = correct_project.clone();
wrong_project_2.bidding_ticket_sizes.institutional = TicketSize::new(Some(4999 * USD_UNIT), None);
wrong_project_2.bidding_ticket_sizes.institutional = TicketSize::new(4999 * USD_UNIT, None);

let mut wrong_project_3 = correct_project.clone();
wrong_project_3.bidding_ticket_sizes.professional = TicketSize::new(Some(3000 * USD_UNIT), None);
wrong_project_3.bidding_ticket_sizes.institutional = TicketSize::new(Some(0 * USD_UNIT), None);
wrong_project_3.bidding_ticket_sizes.professional = TicketSize::new(3000 * USD_UNIT, None);
wrong_project_3.bidding_ticket_sizes.institutional = TicketSize::new(0 * USD_UNIT, None);

let mut wrong_project_4 = correct_project.clone();
wrong_project_4.bidding_ticket_sizes.professional = TicketSize::new(None, None);
wrong_project_4.bidding_ticket_sizes.institutional = TicketSize::new(None, None);
wrong_project_4.bidding_ticket_sizes.professional = TicketSize::new(USD_UNIT, None);
wrong_project_4.bidding_ticket_sizes.institutional = TicketSize::new(USD_UNIT, None);

// min higher than max
let mut wrong_project_5 = correct_project.clone();
wrong_project_5.bidding_ticket_sizes.professional =
TicketSize::new(Some(5000 * USD_UNIT), Some(4990 * USD_UNIT));
wrong_project_5.bidding_ticket_sizes.professional = TicketSize::new(5000 * USD_UNIT, Some(4990 * USD_UNIT));

let mut wrong_project_6 = correct_project.clone();
wrong_project_6.bidding_ticket_sizes.institutional =
TicketSize::new(Some(6000 * USD_UNIT), Some(5500 * USD_UNIT));
TicketSize::new(6000 * USD_UNIT, Some(5500 * USD_UNIT));

let wrong_projects = vec![
wrong_project_1.clone(),
Expand Down Expand Up @@ -835,14 +834,14 @@ mod edit_project_extrinsic {
)
.unwrap(),
bidding_ticket_sizes: BiddingTicketSizes {
professional: TicketSize::new(Some(10_000 * USD_UNIT), Some(20_000 * USD_UNIT)),
institutional: TicketSize::new(Some(20_000 * USD_UNIT), Some(30_000 * USD_UNIT)),
professional: TicketSize::new(10_000 * USD_UNIT, Some(20_000 * USD_UNIT)),
institutional: TicketSize::new(20_000 * USD_UNIT, Some(30_000 * USD_UNIT)),
phantom: Default::default(),
},
contributing_ticket_sizes: ContributingTicketSizes {
retail: TicketSize::new(Some(1_000 * USD_UNIT), Some(2_000 * USD_UNIT)),
professional: TicketSize::new(Some(2_000 * USD_UNIT), Some(3_000 * USD_UNIT)),
institutional: TicketSize::new(Some(3_000 * USD_UNIT), Some(4_000 * USD_UNIT)),
retail: TicketSize::new(1_000 * USD_UNIT, Some(2_000 * USD_UNIT)),
professional: TicketSize::new(2_000 * USD_UNIT, Some(3_000 * USD_UNIT)),
institutional: TicketSize::new(3_000 * USD_UNIT, Some(4_000 * USD_UNIT)),
phantom: Default::default(),
},
participation_currencies: vec![AcceptedFundingAsset::USDT, AcceptedFundingAsset::USDC]
Expand Down
30 changes: 15 additions & 15 deletions pallets/funding/src/tests/3_auction.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ mod round_flow {
auction_round_allocation_percentage: Percent::from_percent(50u8),
minimum_price: decimal_aware_price,
bidding_ticket_sizes: BiddingTicketSizes {
professional: TicketSize::new(Some(5000 * USD_UNIT), None),
institutional: TicketSize::new(Some(5000 * USD_UNIT), None),
professional: TicketSize::new(5000 * USD_UNIT, None),
institutional: TicketSize::new(5000 * USD_UNIT, None),
phantom: Default::default(),
},
contributing_ticket_sizes: ContributingTicketSizes {
retail: TicketSize::new(None, None),
professional: TicketSize::new(None, None),
institutional: TicketSize::new(None, None),
retail: TicketSize::new(USD_UNIT, None),
professional: TicketSize::new(USD_UNIT, None),
institutional: TicketSize::new(USD_UNIT, None),
phantom: Default::default(),
},
participation_currencies: vec![AcceptedFundingAsset::USDT].try_into().unwrap(),
Expand Down Expand Up @@ -610,7 +610,7 @@ mod round_flow {
auction_allocations_usd.push(auction_allocation_usd);

let min_professional_bid_usd =
project_metadata.bidding_ticket_sizes.professional.usd_minimum_per_participation.unwrap();
project_metadata.bidding_ticket_sizes.professional.usd_minimum_per_participation;
min_bid_amounts_usd.push(min_professional_bid_usd);
let min_professional_bid_ct =
project_metadata.minimum_price.reciprocal().unwrap().saturating_mul_int(min_professional_bid_usd);
Expand Down Expand Up @@ -1533,8 +1533,8 @@ mod bid_extrinsic {
let mut project_metadata = default_project_metadata(ISSUER_1);
project_metadata.total_allocation_size = 100_000 * CT_UNIT;
project_metadata.bidding_ticket_sizes = BiddingTicketSizes {
professional: TicketSize::new(Some(8_000 * USD_UNIT), None),
institutional: TicketSize::new(Some(20_000 * USD_UNIT), None),
professional: TicketSize::new(8_000 * USD_UNIT, None),
institutional: TicketSize::new(20_000 * USD_UNIT, None),
phantom: Default::default(),
};

Expand Down Expand Up @@ -1589,8 +1589,8 @@ mod bid_extrinsic {
let mut project_metadata = default_project_metadata(ISSUER_1);
project_metadata.total_allocation_size = 100_000 * CT_UNIT;
project_metadata.bidding_ticket_sizes = BiddingTicketSizes {
professional: TicketSize::new(Some(8_000 * USD_UNIT), None),
institutional: TicketSize::new(Some(20_000 * USD_UNIT), None),
professional: TicketSize::new(8_000 * USD_UNIT, None),
institutional: TicketSize::new(20_000 * USD_UNIT, None),
phantom: Default::default(),
};
project_metadata.minimum_price = PriceProviderOf::<TestRuntime>::calculate_decimals_aware_price(
Expand Down Expand Up @@ -1671,14 +1671,14 @@ mod bid_extrinsic {
let mut inst = MockInstantiator::new(Some(RefCell::new(new_test_ext())));
let mut project_metadata = default_project_metadata(ISSUER_1);
project_metadata.bidding_ticket_sizes = BiddingTicketSizes {
professional: TicketSize::new(Some(8_000 * USD_UNIT), Some(100_000 * USD_UNIT)),
institutional: TicketSize::new(Some(20_000 * USD_UNIT), Some(500_000 * USD_UNIT)),
professional: TicketSize::new(8_000 * USD_UNIT, Some(100_000 * USD_UNIT)),
institutional: TicketSize::new(20_000 * USD_UNIT, Some(500_000 * USD_UNIT)),
phantom: Default::default(),
};
project_metadata.contributing_ticket_sizes = ContributingTicketSizes {
retail: TicketSize::new(None, Some(100_000 * USD_UNIT)),
professional: TicketSize::new(None, Some(20_000 * USD_UNIT)),
institutional: TicketSize::new(None, Some(50_000 * USD_UNIT)),
retail: TicketSize::new(USD_UNIT, Some(100_000 * USD_UNIT)),
professional: TicketSize::new(USD_UNIT, Some(20_000 * USD_UNIT)),
institutional: TicketSize::new(USD_UNIT, Some(50_000 * USD_UNIT)),
phantom: Default::default(),
};
let evaluations = default_evaluations();
Expand Down
22 changes: 11 additions & 11 deletions pallets/funding/src/tests/4_community.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -591,14 +591,14 @@ mod community_contribute_extrinsic {
project_metadata.mainnet_token_max_supply = 80_000_000 * CT_UNIT;
project_metadata.total_allocation_size = 10_000_000 * CT_UNIT;
project_metadata.bidding_ticket_sizes = BiddingTicketSizes {
professional: TicketSize::new(Some(5000 * USD_UNIT), None),
institutional: TicketSize::new(Some(5000 * USD_UNIT), None),
professional: TicketSize::new(5000 * USD_UNIT, None),
institutional: TicketSize::new(5000 * USD_UNIT, None),
phantom: Default::default(),
};
project_metadata.contributing_ticket_sizes = ContributingTicketSizes {
retail: TicketSize::new(None, None),
professional: TicketSize::new(None, None),
institutional: TicketSize::new(None, None),
retail: TicketSize::new(USD_UNIT, None),
professional: TicketSize::new(USD_UNIT, None),
institutional: TicketSize::new(USD_UNIT, None),
phantom: Default::default(),
};
let evaluations =
Expand Down Expand Up @@ -1019,9 +1019,9 @@ mod community_contribute_extrinsic {
let mut inst = MockInstantiator::new(Some(RefCell::new(new_test_ext())));
let mut project_metadata = default_project_metadata(ISSUER_1);
project_metadata.contributing_ticket_sizes = ContributingTicketSizes {
retail: TicketSize::new(Some(10 * USD_UNIT), None),
professional: TicketSize::new(Some(100_000 * USD_UNIT), None),
institutional: TicketSize::new(Some(200_000 * USD_UNIT), None),
retail: TicketSize::new(10 * USD_UNIT, None),
professional: TicketSize::new(100_000 * USD_UNIT, None),
institutional: TicketSize::new(200_000 * USD_UNIT, None),
phantom: Default::default(),
};

Expand Down Expand Up @@ -1112,9 +1112,9 @@ mod community_contribute_extrinsic {
let mut inst = MockInstantiator::new(Some(RefCell::new(new_test_ext())));
let mut project_metadata = default_project_metadata(ISSUER_1);
project_metadata.contributing_ticket_sizes = ContributingTicketSizes {
retail: TicketSize::new(None, Some(100_000 * USD_UNIT)),
professional: TicketSize::new(None, Some(20_000 * USD_UNIT)),
institutional: TicketSize::new(None, Some(50_000 * USD_UNIT)),
retail: TicketSize::new(USD_UNIT, Some(100_000 * USD_UNIT)),
professional: TicketSize::new(USD_UNIT, Some(20_000 * USD_UNIT)),
institutional: TicketSize::new(USD_UNIT, Some(50_000 * USD_UNIT)),
phantom: Default::default(),
};

Expand Down
Loading

0 comments on commit d4124c0

Please sign in to comment.