nuking useless return arg

Author: benesjan

noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/test.nr

@@ -13,7 +13,7 @@ global FULFILL_ORDER_AUTHWIT_NONCE: Field = 2;
 
 #[test]
 unconstrained fn create_order_happy_path() {
-    let (mut env, orderbook_address, token0_address, token1_address, owner, _) =
+    let (mut env, orderbook_address, token0_address, token1_address, owner) =
         setup_orderbook_with_tokens(true);
 
     let token0 = Token::at(token0_address);
@@ -46,7 +46,7 @@ unconstrained fn create_order_happy_path() {
 
 #[test]
 unconstrained fn full_flow() {
-    let (mut env, orderbook_address, token0_address, token1_address, maker, _) =
+    let (mut env, orderbook_address, token0_address, token1_address, maker) =
         setup_orderbook_with_tokens(true);
 
     let token0 = Token::at(token0_address);
@@ -119,7 +119,7 @@ unconstrained fn full_flow() {
 
 #[test(should_fail_with = "ZERO_BID_AMOUNT")]
 unconstrained fn create_order_zero_bid_amount() {
-    let (mut env, orderbook_address, token0_address, token1_address, owner, _) =
+    let (mut env, orderbook_address, token0_address, token1_address, owner) =
         setup_orderbook_with_tokens(false);
 
     let orderbook = Orderbook::at(orderbook_address);
@@ -140,7 +140,7 @@ unconstrained fn create_order_zero_bid_amount() {
 
 #[test(should_fail_with = "ZERO_ASK_AMOUNT")]
 unconstrained fn create_order_zero_ask_amount() {
-    let (mut env, orderbook_address, token0_address, token1_address, owner, _) =
+    let (mut env, orderbook_address, token0_address, token1_address, owner) =
         setup_orderbook_with_tokens(false);
 
     let orderbook = Orderbook::at(orderbook_address);
@@ -161,7 +161,7 @@ unconstrained fn create_order_zero_ask_amount() {
 
 #[test(should_fail_with = "BID_TOKEN_IS_INVALID")]
 unconstrained fn create_order_invalid_bid_token() {
-    let (mut env, orderbook_address, _token0_address, token1_address, owner, _) =
+    let (mut env, orderbook_address, _token0_address, token1_address, owner) =
         setup_orderbook_with_tokens(false);
 
     let orderbook = Orderbook::at(orderbook_address);
@@ -182,7 +182,7 @@ unconstrained fn create_order_invalid_bid_token() {
 
 #[test(should_fail_with = "ASK_TOKEN_IS_INVALID")]
 unconstrained fn create_order_invalid_ask_token() {
-    let (mut env, orderbook_address, token0_address, _token1_address, owner, _) =
+    let (mut env, orderbook_address, token0_address, _token1_address, owner) =
         setup_orderbook_with_tokens(false);
 
     let orderbook = Orderbook::at(orderbook_address);
@@ -203,7 +203,7 @@ unconstrained fn create_order_invalid_ask_token() {
 
 #[test(should_fail_with = "SAME_TOKEN_TRADE")]
 unconstrained fn create_order_same_tokens() {
-    let (mut env, orderbook_address, token0_address, _token1_address, owner, _) =
+    let (mut env, orderbook_address, token0_address, _token1_address, owner) =
         setup_orderbook_with_tokens(false);
 
     let orderbook = Orderbook::at(orderbook_address);

noir-projects/noir-contracts/contracts/app/orderbook_contract/src/test/utils.nr

@@ -36,7 +36,7 @@ pub(crate) unconstrained fn setup_tokens(
 // Utility function to setup orderbook with two tokens
 pub(crate) unconstrained fn setup_orderbook_with_tokens(
     with_account_contracts: bool,
-) -> (TestEnvironment, AztecAddress, AztecAddress, AztecAddress, AztecAddress, AztecAddress) {
+) -> (TestEnvironment, AztecAddress, AztecAddress, AztecAddress, AztecAddress) {
     let mut env = TestEnvironment::new();
     let owner = if with_account_contracts {
         env.create_contract_account()
@@ -51,5 +51,5 @@ pub(crate) unconstrained fn setup_orderbook_with_tokens(
     let orderbook_address =
         env.deploy("Orderbook").with_public_initializer(owner, orderbook_initializer);
 
-    (env, orderbook_address, token0_address, token1_address, owner, owner)
+    (env, orderbook_address, token0_address, token1_address, owner)
 }