[SC test]: Remove the cheatcodes::set_contract_address() (2)

Author: masaun

src/dripper/src/tests/token_helper.nr

@@ -243,9 +243,10 @@ pub unconstrained fn transfer_in_private(
     let note_randomness = random();
     let _ = OracleMock::mock("getRandomField").returns(note_randomness);
 
-    env.impersonate(from);
-    Token::at(token_contract_address).transfer_private_to_private(from, recipient, amount, 0).call(
-        &mut env.private(),
+    //env.impersonate(from);
+    env.call_public(
+        from,
+        Token::at(token_contract_address).transfer_private_to_private(from, recipient, amount, 0)
     );
 
     env.mine_block();
@@ -283,12 +284,10 @@ pub unconstrained fn check_total_supply(
 
 pub unconstrained fn get_total_supply(token_contract_address: AztecAddress) -> u128 {
     let current_contract_address = get_contract_address();
-    cheatcodes::set_contract_address(token_contract_address);
     let block_number = get_block_number();
 
     let total_supply_slot = Token::storage_layout().total_supply.slot;
     let total_supply: u128 = storage_read(token_contract_address, total_supply_slot, block_number);
-    cheatcodes::set_contract_address(current_contract_address);
     total_supply
 }
 
@@ -306,10 +305,8 @@ pub unconstrained fn get_private_balance(
     address: AztecAddress,
 ) -> u128 {
     let current_contract_address = get_contract_address();
-    cheatcodes::set_contract_address(token_contract_address);
     // Direct call to unconstrained
     let amt = Token::balance_of_private(address);
-    cheatcodes::set_contract_address(current_contract_address);
     amt
 }
 
@@ -388,7 +385,6 @@ pub unconstrained fn authorize_transfer_public_to_public(
     let transfer_public_to_public_call_interface =
         Token::at(token).transfer_public_to_public(from, caller, amount, nonce);
     authwit_cheatcodes::add_public_authwit_from_call_interface(
-        env,
         from,
         caller,
         transfer_public_to_public_call_interface,