serialize tuples everywhere

EkuboProtocol · Nov 7, 2023 · 490747c · 490747c
1 parent f74c3ec
commit 490747c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/src/airdrop_test.cairo b/src/airdrop_test.cairo
@@ -22,8 +22,7 @@ use option::{OptionTrait};
 
 fn deploy(token: ContractAddress, root: felt252) -> IAirdropDispatcher {
     let mut constructor_args: Array<felt252> = ArrayTrait::new();
-    Serde::serialize(@token, ref constructor_args);
-    Serde::serialize(@root, ref constructor_args);
+    Serde::serialize(@(token, root), ref constructor_args);
 
     let (address, _) = deploy_syscall(
         Airdrop::TEST_CLASS_HASH.try_into().unwrap(), 0, constructor_args.span(), true

diff --git a/src/call_trait_test.cairo b/src/call_trait_test.cairo
@@ -120,8 +120,7 @@ fn test_execute_valid_call_data() {
     let (token, _) = deploy_token('TIMELOCK', 'TL', 1);
 
     let mut calldata: Array<felt252> = ArrayTrait::new();
-    Serde::serialize(@contract_address_const::<1>(), ref calldata);
-    Serde::serialize(@1_u256, ref calldata);
+    Serde::serialize(@(contract_address_const::<1>(), 1_u256), ref calldata);
 
     let call = Call {
         to: token.contract_address,

diff --git a/src/governance_token_test.cairo b/src/governance_token_test.cairo
@@ -19,9 +19,7 @@ fn deploy(
     name: felt252, symbol: felt252, supply: u128
 ) -> (IGovernanceTokenDispatcher, IERC20Dispatcher) {
     let mut constructor_args: Array<felt252> = ArrayTrait::new();
-    Serde::serialize(@name, ref constructor_args);
-    Serde::serialize(@symbol, ref constructor_args);
-    Serde::serialize(@supply, ref constructor_args);
+    Serde::serialize(@(name, symbol, supply), ref constructor_args);
 
     let (address, _) = deploy_syscall(
         GovernanceToken::TEST_CLASS_HASH.try_into().unwrap(), 0, constructor_args.span(), true

diff --git a/src/timelock_test.cairo b/src/timelock_test.cairo
@@ -16,9 +16,7 @@ use option::{OptionTrait};
 
 fn deploy(owner: ContractAddress, delay: u64, window: u64) -> ITimelockDispatcher {
     let mut constructor_args: Array<felt252> = ArrayTrait::new();
-    Serde::serialize(@owner, ref constructor_args);
-    Serde::serialize(@delay, ref constructor_args);
-    Serde::serialize(@window, ref constructor_args);
+    Serde::serialize(@(owner, delay, window), ref constructor_args);
 
     let (address, _) = deploy_syscall(
         Timelock::TEST_CLASS_HASH.try_into().unwrap(), 0, constructor_args.span(), true
@@ -43,8 +41,7 @@ fn transfer_call(
     token: IGovernanceTokenDispatcher, recipient: ContractAddress, amount: u256
 ) -> Call {
     let mut calldata: Array<felt252> = ArrayTrait::new();
-    Serde::serialize(@recipient, ref calldata);
-    Serde::serialize(@amount, ref calldata);
+    Serde::serialize(@(recipient, amount), ref calldata);
 
     Call {
         to: token.contract_address,