Rename GasOpts::empty() to default()

AztecProtocol · Apr 8, 2024 · 8fa9373 · 8fa9373
1 parent 70efdc3
commit 8fa9373
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 47 deletions.
diff --git a/noir-projects/aztec-nr/authwit/src/auth.nr b/noir-projects/aztec-nr/authwit/src/auth.nr
@@ -21,7 +21,12 @@ pub fn assert_current_call_valid_authwit(context: &mut PrivateContext, on_behalf
 pub fn assert_current_call_valid_authwit_public(context: &mut PublicContext, on_behalf_of: AztecAddress) {
     let function_selector = FunctionSelector::from_signature("spend_public_authwit(Field)");
     let inner_hash = compute_inner_authwit_hash([context.msg_sender().to_field(), context.selector().to_field(), context.args_hash]);
-    let result = context.call_public_function(on_behalf_of, function_selector, [inner_hash], GasOpts::empty())[0];
+    let result = context.call_public_function(
+        on_behalf_of,
+        function_selector,
+        [inner_hash],
+        GasOpts::default()
+    )[0];
     assert(result == IS_VALID_SELECTOR, "Message not authorized by account");
 }
 // docs:end:assert_current_call_valid_authwit_public

diff --git a/noir-projects/aztec-nr/aztec/src/context/gas.nr b/noir-projects/aztec-nr/aztec/src/context/gas.nr
@@ -5,7 +5,7 @@ struct GasOpts {
 }
 
 impl GasOpts {
-    pub fn empty() -> Self {
+    pub fn default() -> Self {
         GasOpts { l1_gas: Option::none(), l2_gas: Option::none(), da_gas: Option::none() }
     }
 

diff --git a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr
@@ -344,7 +344,7 @@ contract AvmTest {
 
         // Nested call
         let results = context.call_public_function_raw(
-            GasOpts::empty(),
+            GasOpts::default(),
             context.this_address(),
             selector,
             [arg_a, arg_b]
@@ -397,7 +397,7 @@ contract AvmTest {
             context.this_address(),
             selector,
             [arg_a, arg_b],
-            GasOpts::empty()
+            GasOpts::default()
         );
         // this explicit size in the return variable is necessary to ensure that ret_size is compile-time
         // (ensure the data_to_return is in a HeapArray not a HeapVector)
@@ -412,7 +412,7 @@ contract AvmTest {
         let selector = FunctionSelector::from_signature("add_args_return(Field,Field)").to_field();
 
         let (result_data, success): ([Field; 1], u8) = context.static_call_public_function_raw(
-            GasOpts::empty(),
+            GasOpts::default(),
             context.this_address(),
             selector,
             [arg_a, arg_b]
@@ -427,7 +427,7 @@ contract AvmTest {
         let selector = FunctionSelector::from_signature("set_storage_single(Field)").to_field();
         let calldata: [Field; 1] = [20];
 
-        let (_data_to_return, success): ([Field; 0], u8) = context.static_call_public_function_raw(GasOpts::empty(), context.this_address(), selector, calldata);
+        let (_data_to_return, success): ([Field; 0], u8) = context.static_call_public_function_raw(GasOpts::default(), context.this_address(), selector, calldata);
 
         success
     }
@@ -441,7 +441,7 @@ contract AvmTest {
             context.this_address(),
             selector,
             [arg_a, arg_b],
-            GasOpts::empty()
+            GasOpts::default()
         );
 
         result_data[0]
@@ -453,6 +453,6 @@ contract AvmTest {
         let selector = FunctionSelector::from_signature("set_storage_single(Field)");
         let calldata: [Field; 1] = [20];
 
-        let _resultData: [Field; RETURN_VALUES_LENGTH] = context.static_call_public_function(context.this_address(), selector, calldata, GasOpts::empty());
+        let _resultData: [Field; RETURN_VALUES_LENGTH] = context.static_call_public_function(context.this_address(), selector, calldata, GasOpts::default());
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/benchmarking_contract/src/main.nr b/noir-projects/noir-contracts/contracts/benchmarking_contract/src/main.nr
@@ -48,7 +48,7 @@ contract Benchmarking {
             context.this_address(),
             FunctionSelector::from_signature("broadcast((Field))"),
             [owner.to_field()],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 

diff --git a/noir-projects/noir-contracts/contracts/child_contract/src/main.nr b/noir-projects/noir-contracts/contracts/child_contract/src/main.nr
@@ -96,7 +96,7 @@ contract Child {
             context.this_address(),
             pub_set_value_selector,
             [10],
-            GasOpts::empty()
+            GasOpts::default()
         );
 
         storage.current_value.write(20);
@@ -113,7 +113,7 @@ contract Child {
             context.this_address(),
             pub_set_value_selector,
             [10],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/fpc_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/fpc_contract/src/interfaces.nr
@@ -24,7 +24,7 @@ impl Token {
             self.address,
             FunctionSelector::from_signature("transfer_public((Field),(Field),Field,Field)"),
             [from.to_field(), to.to_field(), amount, nonce],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 
@@ -40,7 +40,7 @@ impl Token {
             self.address,
             FunctionSelector::from_signature("shield((Field),Field,Field,Field)"),
             [from.to_field(), amount, secret_hash, nonce],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 

diff --git a/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr b/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr
@@ -66,7 +66,7 @@ contract FPC {
             storage.gas_token_address.read_public(),
             FunctionSelector::from_signature("pay_fee(Field)"),
             [amount],
-            GasOpts::empty()
+            GasOpts::default()
         )[0];
 
         // Just do public refunds for the present
@@ -80,7 +80,7 @@ contract FPC {
             storage.gas_token_address.read_public(),
             FunctionSelector::from_signature("pay_fee(Field)"),
             [amount],
-            GasOpts::empty()
+            GasOpts::default()
         )[0];
 
         Token::at(asset).shield(&mut context, context.this_address(), refund, secret_hash, 0);

diff --git a/noir-projects/noir-contracts/contracts/lending_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/lending_contract/src/interfaces.nr
@@ -19,7 +19,7 @@ impl PriceFeed {
             self.address,
             FunctionSelector::from_signature("get_price(Field)"),
             [0],
-            GasOpts::empty()
+            GasOpts::default()
         );
 
         U128::from_integer(return_values[0])
@@ -47,7 +47,7 @@ impl Token {
             self.address,
             FunctionSelector::from_signature("transfer_public((Field),(Field),Field,Field)"),
             [from.to_field(), to.to_field(), amount, nonce],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 
@@ -56,7 +56,7 @@ impl Token {
             self.address,
             FunctionSelector::from_signature("mint_public((Field),Field)"),
             [to.to_field(), amount],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 
@@ -71,7 +71,7 @@ impl Token {
             self.address,
             FunctionSelector::from_signature("burn_public((Field),Field,Field)"),
             [from.to_field(), amount, nonce],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 

diff --git a/noir-projects/noir-contracts/contracts/lending_contract/src/main.nr b/noir-projects/noir-contracts/contracts/lending_contract/src/main.nr
@@ -127,7 +127,7 @@ contract Lending {
             context.this_address(),
             selector,
             [on_behalf_of, amount, collateral_asset.to_field()],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 
@@ -162,7 +162,7 @@ contract Lending {
             context.this_address(),
             selector,
             [context.msg_sender().to_field(), to.to_field(), amount],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 
@@ -221,7 +221,7 @@ contract Lending {
             context.this_address(),
             selector,
             [context.msg_sender().to_field(), to.to_field(), amount],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 
@@ -285,7 +285,7 @@ contract Lending {
             context.this_address(),
             selector,
             [owner.to_field(), amount, stable_coin.to_field()],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 

diff --git a/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr b/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr
@@ -24,7 +24,7 @@ contract Parent {
             target_contract,
             target_selector,
             [init_value],
-            GasOpts::empty()
+            GasOpts::default()
         );
 
         return_values[0]
@@ -41,13 +41,13 @@ contract Parent {
             target_contract,
             target_selector,
             [init_value],
-            GasOpts::empty()
+            GasOpts::default()
         )[0];
         let return_values = context.call_public_function(
             target_contract,
             target_selector,
             [return_value],
-            GasOpts::empty()
+            GasOpts::default()
         );
 
         return_values[0]
@@ -202,7 +202,7 @@ contract Parent {
         target_selector: FunctionSelector,
         args: [Field; 1]
     ) -> Field {
-        let return_values = context.static_call_public_function(target_contract, target_selector, args, GasOpts::empty());
+        let return_values = context.static_call_public_function(target_contract, target_selector, args, GasOpts::default());
 
         return_values[0]
     }
@@ -221,7 +221,7 @@ contract Parent {
             this_address,
             pub_entry_point_selector,
             [target_contract.to_field(), target_selector.to_field(), args[0]],
-            GasOpts::empty()
+            GasOpts::default()
         );
         return_values[0]
     }

diff --git a/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr
@@ -29,7 +29,7 @@ contract StatefulTest {
             context.this_address(),
             selector,
             [owner.to_field(), value],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 

diff --git a/noir-projects/noir-contracts/contracts/test_contract/src/interface.nr b/noir-projects/noir-contracts/contracts/test_contract/src/interface.nr
@@ -602,7 +602,7 @@ impl TestPublicContextInterface {
             self.address,
             FunctionSelector::from_field(0x9e88565a),
             serialized_args,
-            GasOpts::empty()
+            GasOpts::default()
         )
     }
 
@@ -620,7 +620,7 @@ impl TestPublicContextInterface {
             self.address,
             FunctionSelector::from_field(0x9749ca06),
             serialized_args,
-            GasOpts::empty()
+            GasOpts::default()
         )
     }
 
@@ -638,7 +638,7 @@ impl TestPublicContextInterface {
             self.address,
             FunctionSelector::from_field(0x2fb25188),
             serialized_args,
-            GasOpts::empty()
+            GasOpts::default()
         )
     }
 
@@ -650,7 +650,7 @@ impl TestPublicContextInterface {
             self.address,
             FunctionSelector::from_field(0xb5bb17fa),
             serialized_args,
-            GasOpts::empty()
+            GasOpts::default()
         )
     }
 
@@ -670,7 +670,7 @@ impl TestPublicContextInterface {
             self.address,
             FunctionSelector::from_field(0xa0f84219),
             serialized_args,
-            GasOpts::empty()
+            GasOpts::default()
         )
     }
 
@@ -690,7 +690,7 @@ impl TestPublicContextInterface {
             self.address,
             FunctionSelector::from_field(0x42ca6d60),
             serialized_args,
-            GasOpts::empty()
+            GasOpts::default()
         )
     }
 
@@ -706,7 +706,7 @@ impl TestPublicContextInterface {
             self.address,
             FunctionSelector::from_field(0x817a64cb),
             serialized_args,
-            GasOpts::empty()
+            GasOpts::default()
         )
     }
 
@@ -724,7 +724,7 @@ impl TestPublicContextInterface {
             self.address,
             FunctionSelector::from_field(0xdf02db8d),
             serialized_args,
-            GasOpts::empty()
+            GasOpts::default()
         )
     }
 
@@ -740,7 +740,7 @@ impl TestPublicContextInterface {
             self.address,
             FunctionSelector::from_field(0x86e38c61),
             serialized_args,
-            GasOpts::empty()
+            GasOpts::default()
         )
     }
 }

diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr
@@ -23,7 +23,7 @@ impl SlowMap {
             self.address,
             FunctionSelector::from_signature("read_at_pub(Field)"),
             [index],
-            GasOpts::empty()
+            GasOpts::default()
         );
         _return_values[0]
     }

diff --git a/noir-projects/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr b/noir-projects/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr
@@ -16,7 +16,7 @@ impl Token {
             self.address,
             FunctionSelector::from_signature("mint_public((Field),Field)"),
             [to.to_field(), amount],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
 
@@ -32,7 +32,7 @@ impl Token {
             self.address,
             FunctionSelector::from_signature("burn_public((Field),Field,Field)"),
             [from.to_field(), amount, nonce],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }
     // docs:end:public_burn_interface
@@ -42,7 +42,7 @@ impl Token {
             self.address,
             FunctionSelector::from_signature("mint_private(Field,Field)"),
             [amount, secret_hash],
-            GasOpts::empty()
+            GasOpts::default()
         );
     }