Skip to content

Commit

Permalink
temp new parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
@psorinionut
psorinionut committed Nov 18, 2024
1 parent fbbf595 commit b323aa2
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 45 deletions.
12 changes: 4 additions & 8 deletions launchpad-guaranteed-tickets-v2/src/guaranteed_tickets_init.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,8 @@ pub trait GuaranteedTicketsInitModule:
{
fn add_tickets_with_guaranteed_winners(
&self,
address_number_pairs: MultiValueManagedVec<
MultiValue3<
ManagedAddress,
usize,
MultiValueManagedVecCounted<MultiValue2<usize, usize>>,
>,
address_number_pairs: MultiValueEncoded<
MultiValue3<ManagedAddress, usize, MultiValueEncodedCounted<MultiValue2<usize, usize>>>,
>,
) -> AddTicketsResult {
self.require_add_tickets_period();
Expand All @@ -57,7 +53,7 @@ pub trait GuaranteedTicketsInitModule:
let mut total_tickets_added = 0;
let mut total_guaranteed_tickets_added = 0;

for multi_arg in address_number_pairs.iter() {
for multi_arg in address_number_pairs.into_iter() {
let (buyer, total_tickets_allowance, guaranteed_ticket_raw) = multi_arg.into_tuple();
require!(
guaranteed_ticket_raw.len() <= MAX_GUARANTEED_TICKETS_ENTRIES,
Expand All @@ -71,7 +67,7 @@ pub trait GuaranteedTicketsInitModule:
let mut user_guaranteed_tickets = 0;

let mut guaranteed_ticket_infos = ManagedVec::new();
for info in guaranteed_ticket_raw.into_vec().iter() {
for info in guaranteed_ticket_raw.into_iter() {
let (guaranteed_tickets, min_confirmed_tickets) = info.into_tuple();
require!(
guaranteed_tickets <= min_confirmed_tickets,
Expand Down
8 changes: 2 additions & 6 deletions launchpad-guaranteed-tickets-v2/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,8 @@ pub trait LaunchpadGuaranteedTickets:
#[endpoint(addTickets)]
fn add_tickets_endpoint(
&self,
address_number_pairs: MultiValueManagedVec<
MultiValue3<
ManagedAddress,
usize,
MultiValueManagedVecCounted<MultiValue2<usize, usize>>,
>,
address_number_pairs: MultiValueEncoded<
MultiValue3<ManagedAddress, usize, MultiValueEncodedCounted<MultiValue2<usize, usize>>>,
>,
) {
let add_tickets_result = self.add_tickets_with_guaranteed_winners(address_number_pairs);
Expand Down
12 changes: 6 additions & 6 deletions launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_setup/mod.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use multiversx_sc::types::{
Address, EgldOrEsdtTokenIdentifier, MultiValueEncoded, MultiValueManagedVec,
MultiValueManagedVecCounted, OperationCompletionStatus,
Address, EgldOrEsdtTokenIdentifier, MultiValueEncoded, MultiValueEncodedCounted,
OperationCompletionStatus,
};

use launchpad_common::{
Expand Down Expand Up @@ -95,24 +95,24 @@ where
// first user - 1 ticket, second user - 2 tickets, 3rd user - 3 tickets
b_mock
.execute_tx(&owner_address, &lp_wrapper, &rust_zero, |sc| {
let mut args = MultiValueManagedVec::new();
let mut args = MultiValueEncoded::new();
args.push(
(
managed_address!(&participants[0]),
1,
MultiValueManagedVecCounted::new(),
MultiValueEncodedCounted::new(),
)
.into(),
);
args.push(
(
managed_address!(&participants[1]),
2,
MultiValueManagedVecCounted::new(),
MultiValueEncodedCounted::new(),
)
.into(),
);
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 3).into());
args.push(
(
Expand Down
50 changes: 25 additions & 25 deletions launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use launchpad_guaranteed_tickets_v2::{
LaunchpadGuaranteedTickets,
};
use multiversx_sc::types::{
EgldOrEsdtTokenIdentifier, MultiValueEncoded, MultiValueManagedVec, MultiValueManagedVecCounted,
EgldOrEsdtTokenIdentifier, MultiValueEncoded, MultiValueEncodedCounted,
};
use multiversx_sc_scenario::{managed_address, managed_biguint, rust_biguint};

Expand Down Expand Up @@ -260,8 +260,8 @@ fn combined_scenario_test() {
&lp_setup.lp_wrapper,
&rust_biguint!(0),
|sc| {
let mut args = MultiValueManagedVec::new();
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut args = MultiValueEncoded::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 3).into());
args.push(
(
Expand All @@ -275,7 +275,7 @@ fn combined_scenario_test() {
(
managed_address!(&second_new_participant),
1,
MultiValueManagedVecCounted::new(),
MultiValueEncodedCounted::new(),
)
.into(),
);
Expand Down Expand Up @@ -397,8 +397,8 @@ fn add_migration_guaranteed_tickets_distribution_isolated_steps_scenario_test()
&lp_setup.lp_wrapper,
&rust_biguint!(0),
|sc| {
let mut args = MultiValueManagedVec::new();
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut args = MultiValueEncoded::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 1).into());
args.push(
(
Expand All @@ -408,7 +408,7 @@ fn add_migration_guaranteed_tickets_distribution_isolated_steps_scenario_test()
)
.into(),
);
let mut guaranteed_tickets_info2 = MultiValueManagedVecCounted::new();
let mut guaranteed_tickets_info2 = MultiValueEncodedCounted::new();
guaranteed_tickets_info2.push((2, 3).into());
args.push(
(
Expand Down Expand Up @@ -572,8 +572,8 @@ fn add_migration_guaranteed_tickets_distribution_and_claim_scenario_test() {
&lp_setup.lp_wrapper,
&rust_biguint!(0),
|sc| {
let mut args = MultiValueManagedVec::new();
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut args = MultiValueEncoded::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 1).into());
args.push(
(
Expand All @@ -583,7 +583,7 @@ fn add_migration_guaranteed_tickets_distribution_and_claim_scenario_test() {
)
.into(),
);
let mut guaranteed_tickets_info2 = MultiValueManagedVecCounted::new();
let mut guaranteed_tickets_info2 = MultiValueEncodedCounted::new();
guaranteed_tickets_info2.push((2, 3).into());
args.push(
(
Expand Down Expand Up @@ -762,8 +762,8 @@ fn condition_checks_test() {
&lp_setup.lp_wrapper,
&rust_biguint!(0),
|sc| {
let mut args = MultiValueManagedVec::new();
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut args = MultiValueEncoded::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 1).into());
args.push(
(
Expand All @@ -784,8 +784,8 @@ fn condition_checks_test() {
&lp_setup.lp_wrapper,
&rust_biguint!(0),
|sc| {
let mut args = MultiValueManagedVec::new();
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut args = MultiValueEncoded::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 1).into());
args.push(
(
Expand All @@ -809,8 +809,8 @@ fn condition_checks_test() {
&lp_setup.lp_wrapper,
&rust_biguint!(0),
|sc| {
let mut args = MultiValueManagedVec::new();
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut args = MultiValueEncoded::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 1).into());
args.push(
(
Expand Down Expand Up @@ -937,8 +937,8 @@ fn blacklist_scenario_test() {
&lp_setup.lp_wrapper,
&rust_biguint!(0),
|sc| {
let mut args = MultiValueManagedVec::new();
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut args = MultiValueEncoded::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 1).into());
args.push(
(
Expand All @@ -948,7 +948,7 @@ fn blacklist_scenario_test() {
)
.into(),
);
let mut guaranteed_tickets_info2 = MultiValueManagedVecCounted::new();
let mut guaranteed_tickets_info2 = MultiValueEncodedCounted::new();
guaranteed_tickets_info2.push((1, 1).into());
args.push(
(
Expand Down Expand Up @@ -1206,8 +1206,8 @@ fn confirm_less_tickets_than_total_available_with_vesting_scenario_test() {
&lp_setup.lp_wrapper,
&rust_biguint!(0),
|sc| {
let mut args = MultiValueManagedVec::new();
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut args = MultiValueEncoded::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 1).into());
args.push(
(
Expand Down Expand Up @@ -1484,9 +1484,9 @@ fn multiple_guaranteed_tickets_test() {
&lp_setup.lp_wrapper,
&rust_biguint!(0),
|sc| {
let mut args = MultiValueManagedVec::new();
let mut args = MultiValueEncoded::new();
// New participant: 1 guaranteed ticket if confirms 2
let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new();
let mut guaranteed_tickets_info = MultiValueEncodedCounted::new();
guaranteed_tickets_info.push((1, 2).into());
args.push(
(
Expand All @@ -1497,7 +1497,7 @@ fn multiple_guaranteed_tickets_test() {
.into(),
);
// Second new participant: complex guaranteed tickets structure
let mut guaranteed_tickets_info2 = MultiValueManagedVecCounted::new();
let mut guaranteed_tickets_info2 = MultiValueEncodedCounted::new();
guaranteed_tickets_info2.push((1, 6).into());
guaranteed_tickets_info2.push((2, 4).into());
guaranteed_tickets_info2.push((3, 3).into());
Expand All @@ -1513,7 +1513,7 @@ fn multiple_guaranteed_tickets_test() {
(
managed_address!(&participants[5]),
9,
MultiValueManagedVecCounted::new(),
MultiValueEncodedCounted::new(),
)
.into(),
);
Expand Down

0 comments on commit b323aa2

Please sign in to comment.