From fbbf5959007663723f62c701df57344f980d85d0 Mon Sep 17 00:00:00 2001 From: Sorin Petreasca Date: Mon, 18 Nov 2024 14:16:08 +0000 Subject: [PATCH] replace MultiValueEncoded with MultiValueManagedVec for addTickets --- .../src/guaranteed_tickets_init.rs | 4 ++-- launchpad-guaranteed-tickets-v2/src/lib.rs | 2 +- .../tests/guaranteed_tickets_setup/mod.rs | 6 +++--- .../tests/guaranteed_tickets_test.rs | 20 +++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/launchpad-guaranteed-tickets-v2/src/guaranteed_tickets_init.rs b/launchpad-guaranteed-tickets-v2/src/guaranteed_tickets_init.rs index e21549d..bdffff9 100644 --- a/launchpad-guaranteed-tickets-v2/src/guaranteed_tickets_init.rs +++ b/launchpad-guaranteed-tickets-v2/src/guaranteed_tickets_init.rs @@ -39,7 +39,7 @@ pub trait GuaranteedTicketsInitModule: { fn add_tickets_with_guaranteed_winners( &self, - address_number_pairs: MultiValueEncoded< + address_number_pairs: MultiValueManagedVec< MultiValue3< ManagedAddress, usize, @@ -57,7 +57,7 @@ pub trait GuaranteedTicketsInitModule: let mut total_tickets_added = 0; let mut total_guaranteed_tickets_added = 0; - for multi_arg in address_number_pairs { + for multi_arg in address_number_pairs.iter() { let (buyer, total_tickets_allowance, guaranteed_ticket_raw) = multi_arg.into_tuple(); require!( guaranteed_ticket_raw.len() <= MAX_GUARANTEED_TICKETS_ENTRIES, diff --git a/launchpad-guaranteed-tickets-v2/src/lib.rs b/launchpad-guaranteed-tickets-v2/src/lib.rs index 6a421d1..3aa1b95 100644 --- a/launchpad-guaranteed-tickets-v2/src/lib.rs +++ b/launchpad-guaranteed-tickets-v2/src/lib.rs @@ -71,7 +71,7 @@ pub trait LaunchpadGuaranteedTickets: #[endpoint(addTickets)] fn add_tickets_endpoint( &self, - address_number_pairs: MultiValueEncoded< + address_number_pairs: MultiValueManagedVec< MultiValue3< ManagedAddress, usize, diff --git a/launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_setup/mod.rs b/launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_setup/mod.rs index 05dd666..75c18a0 100644 --- a/launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_setup/mod.rs +++ b/launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_setup/mod.rs @@ -1,6 +1,6 @@ use multiversx_sc::types::{ - Address, EgldOrEsdtTokenIdentifier, MultiValueEncoded, MultiValueManagedVecCounted, - OperationCompletionStatus, + Address, EgldOrEsdtTokenIdentifier, MultiValueEncoded, MultiValueManagedVec, + MultiValueManagedVecCounted, OperationCompletionStatus, }; use launchpad_common::{ @@ -95,7 +95,7 @@ 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 = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); args.push( ( managed_address!(&participants[0]), diff --git a/launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_test.rs b/launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_test.rs index 46bbc35..1a6c746 100644 --- a/launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_test.rs +++ b/launchpad-guaranteed-tickets-v2/tests/guaranteed_tickets_test.rs @@ -21,7 +21,7 @@ use launchpad_guaranteed_tickets_v2::{ LaunchpadGuaranteedTickets, }; use multiversx_sc::types::{ - EgldOrEsdtTokenIdentifier, MultiValueEncoded, MultiValueManagedVecCounted, + EgldOrEsdtTokenIdentifier, MultiValueEncoded, MultiValueManagedVec, MultiValueManagedVecCounted, }; use multiversx_sc_scenario::{managed_address, managed_biguint, rust_biguint}; @@ -260,7 +260,7 @@ fn combined_scenario_test() { &lp_setup.lp_wrapper, &rust_biguint!(0), |sc| { - let mut args = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new(); guaranteed_tickets_info.push((1, 3).into()); args.push( @@ -397,7 +397,7 @@ fn add_migration_guaranteed_tickets_distribution_isolated_steps_scenario_test() &lp_setup.lp_wrapper, &rust_biguint!(0), |sc| { - let mut args = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new(); guaranteed_tickets_info.push((1, 1).into()); args.push( @@ -572,7 +572,7 @@ fn add_migration_guaranteed_tickets_distribution_and_claim_scenario_test() { &lp_setup.lp_wrapper, &rust_biguint!(0), |sc| { - let mut args = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new(); guaranteed_tickets_info.push((1, 1).into()); args.push( @@ -762,7 +762,7 @@ fn condition_checks_test() { &lp_setup.lp_wrapper, &rust_biguint!(0), |sc| { - let mut args = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new(); guaranteed_tickets_info.push((1, 1).into()); args.push( @@ -784,7 +784,7 @@ fn condition_checks_test() { &lp_setup.lp_wrapper, &rust_biguint!(0), |sc| { - let mut args = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new(); guaranteed_tickets_info.push((1, 1).into()); args.push( @@ -809,7 +809,7 @@ fn condition_checks_test() { &lp_setup.lp_wrapper, &rust_biguint!(0), |sc| { - let mut args = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new(); guaranteed_tickets_info.push((1, 1).into()); args.push( @@ -937,7 +937,7 @@ fn blacklist_scenario_test() { &lp_setup.lp_wrapper, &rust_biguint!(0), |sc| { - let mut args = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new(); guaranteed_tickets_info.push((1, 1).into()); args.push( @@ -1206,7 +1206,7 @@ fn confirm_less_tickets_than_total_available_with_vesting_scenario_test() { &lp_setup.lp_wrapper, &rust_biguint!(0), |sc| { - let mut args = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new(); guaranteed_tickets_info.push((1, 1).into()); args.push( @@ -1484,7 +1484,7 @@ fn multiple_guaranteed_tickets_test() { &lp_setup.lp_wrapper, &rust_biguint!(0), |sc| { - let mut args = MultiValueEncoded::new(); + let mut args = MultiValueManagedVec::new(); // New participant: 1 guaranteed ticket if confirms 2 let mut guaranteed_tickets_info = MultiValueManagedVecCounted::new(); guaranteed_tickets_info.push((1, 2).into());