@@ -115,9 +115,8 @@ fn p256verify_test_tx(
115115{
116116 const SPEC_ID : OpSpecId = OpSpecId :: FJORD ;
117117
118- let InitialAndFloorGas {
119- initial_total_gas, ..
120- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & [ ] , false , 0 , 0 , 0 ) ;
118+ let InitialAndFloorGas { initial_total_gas, .. } =
119+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & [ ] , false , 0 , 0 , 0 ) ;
121120
122121 Context :: op ( )
123122 . with_tx (
@@ -148,9 +147,8 @@ fn test_tx_call_p256verify() {
148147#[ test]
149148fn test_halted_tx_call_p256verify ( ) {
150149 const SPEC_ID : OpSpecId = OpSpecId :: FJORD ;
151- let InitialAndFloorGas {
152- initial_total_gas, ..
153- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & [ ] , false , 0 , 0 , 0 ) ;
150+ let InitialAndFloorGas { initial_total_gas, .. } =
151+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & [ ] , false , 0 , 0 , 0 ) ;
154152 let original_gas_limit = initial_total_gas + secp256r1:: P256VERIFY_BASE_GAS_FEE ;
155153
156154 let ctx = Context :: op ( )
@@ -185,9 +183,8 @@ fn bn254_pair_test_tx(
185183) -> Context < BlockEnv , OpTransaction < TxEnv > , CfgEnv < OpSpecId > , EmptyDB , Journal < EmptyDB > , L1BlockInfo >
186184{
187185 let input = Bytes :: from ( [ 1 ; GRANITE_MAX_INPUT_SIZE + 2 ] ) ;
188- let InitialAndFloorGas {
189- initial_total_gas, ..
190- } = calculate_initial_tx_gas ( spec. into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
186+ let InitialAndFloorGas { initial_total_gas, .. } =
187+ calculate_initial_tx_gas ( spec. into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
191188
192189 Context :: op ( )
193190 . with_tx (
@@ -320,9 +317,8 @@ fn g1_msm_test_tx(
320317 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
321318
322319 let input = Bytes :: from ( [ 1 ; bls12_381_const:: G1_MSM_INPUT_LENGTH ] ) ;
323- let InitialAndFloorGas {
324- initial_total_gas, ..
325- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
320+ let InitialAndFloorGas { initial_total_gas, .. } =
321+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
326322 let gs1_msm_gas = bls12_381_utils:: msm_required_gas (
327323 1 ,
328324 & bls12_381_const:: DISCOUNT_TABLE_G1_MSM ,
@@ -351,9 +347,8 @@ fn g1_msm_test_tx(
351347fn test_halted_tx_call_bls12_381_g1_msm_input_wrong_size ( ) {
352348 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
353349 let input = Bytes :: from ( [ 1 ; bls12_381_const:: G1_MSM_INPUT_LENGTH ] ) ;
354- let InitialAndFloorGas {
355- initial_total_gas, ..
356- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
350+ let InitialAndFloorGas { initial_total_gas, .. } =
351+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
357352 let gs1_msm_gas = bls12_381_utils:: msm_required_gas (
358353 1 ,
359354 & bls12_381_const:: DISCOUNT_TABLE_G1_MSM ,
@@ -399,9 +394,8 @@ fn test_halted_tx_call_bls12_381_g1_msm_input_wrong_size() {
399394fn test_halted_tx_call_bls12_381_g1_msm_out_of_gas ( ) {
400395 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
401396 let input = Bytes :: from ( [ 1 ; bls12_381_const:: G1_MSM_INPUT_LENGTH ] ) ;
402- let InitialAndFloorGas {
403- initial_total_gas, ..
404- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
397+ let InitialAndFloorGas { initial_total_gas, .. } =
398+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
405399 let gs1_msm_gas = bls12_381_utils:: msm_required_gas (
406400 1 ,
407401 & bls12_381_const:: DISCOUNT_TABLE_G1_MSM ,
@@ -545,9 +539,8 @@ fn g2_msm_test_tx(
545539 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
546540
547541 let input = Bytes :: from ( [ 1 ; bls12_381_const:: G2_MSM_INPUT_LENGTH ] ) ;
548- let InitialAndFloorGas {
549- initial_total_gas, ..
550- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
542+ let InitialAndFloorGas { initial_total_gas, .. } =
543+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
551544 let gs2_msm_gas = bls12_381_utils:: msm_required_gas (
552545 1 ,
553546 & bls12_381_const:: DISCOUNT_TABLE_G2_MSM ,
@@ -576,9 +569,8 @@ fn g2_msm_test_tx(
576569fn test_halted_tx_call_bls12_381_g2_msm_input_wrong_size ( ) {
577570 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
578571 let input = Bytes :: from ( [ 1 ; bls12_381_const:: G2_MSM_INPUT_LENGTH ] ) ;
579- let InitialAndFloorGas {
580- initial_total_gas, ..
581- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
572+ let InitialAndFloorGas { initial_total_gas, .. } =
573+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
582574 let gs2_msm_gas = bls12_381_utils:: msm_required_gas (
583575 1 ,
584576 & bls12_381_const:: DISCOUNT_TABLE_G2_MSM ,
@@ -624,9 +616,8 @@ fn test_halted_tx_call_bls12_381_g2_msm_input_wrong_size() {
624616fn test_halted_tx_call_bls12_381_g2_msm_out_of_gas ( ) {
625617 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
626618 let input = Bytes :: from ( [ 1 ; bls12_381_const:: G2_MSM_INPUT_LENGTH ] ) ;
627- let InitialAndFloorGas {
628- initial_total_gas, ..
629- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
619+ let InitialAndFloorGas { initial_total_gas, .. } =
620+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
630621 let gs2_msm_gas = bls12_381_utils:: msm_required_gas (
631622 1 ,
632623 & bls12_381_const:: DISCOUNT_TABLE_G2_MSM ,
@@ -696,9 +687,8 @@ fn bl12_381_pairing_test_tx(
696687 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
697688
698689 let input = Bytes :: from ( [ 1 ; bls12_381_const:: PAIRING_INPUT_LENGTH ] ) ;
699- let InitialAndFloorGas {
700- initial_total_gas, ..
701- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
690+ let InitialAndFloorGas { initial_total_gas, .. } =
691+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
702692
703693 let pairing_gas: u64 =
704694 bls12_381_const:: PAIRING_MULTIPLIER_BASE + bls12_381_const:: PAIRING_OFFSET_BASE ;
@@ -725,9 +715,8 @@ fn bl12_381_pairing_test_tx(
725715fn test_halted_tx_call_bls12_381_pairing_input_wrong_size ( ) {
726716 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
727717 let input = Bytes :: from ( [ 1 ; bls12_381_const:: PAIRING_INPUT_LENGTH ] ) ;
728- let InitialAndFloorGas {
729- initial_total_gas, ..
730- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
718+ let InitialAndFloorGas { initial_total_gas, .. } =
719+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
731720 let pairing_gas: u64 =
732721 bls12_381_const:: PAIRING_MULTIPLIER_BASE + bls12_381_const:: PAIRING_OFFSET_BASE ;
733722
@@ -770,9 +759,8 @@ fn test_halted_tx_call_bls12_381_pairing_input_wrong_size() {
770759fn test_halted_tx_call_bls12_381_pairing_out_of_gas ( ) {
771760 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
772761 let input = Bytes :: from ( [ 1 ; bls12_381_const:: PAIRING_INPUT_LENGTH ] ) ;
773- let InitialAndFloorGas {
774- initial_total_gas, ..
775- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
762+ let InitialAndFloorGas { initial_total_gas, .. } =
763+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
776764 let pairing_gas: u64 =
777765 bls12_381_const:: PAIRING_MULTIPLIER_BASE + bls12_381_const:: PAIRING_OFFSET_BASE ;
778766
@@ -837,9 +825,8 @@ fn test_tx_call_bls12_381_pairing_wrong_input_layout() {
837825fn test_halted_tx_call_bls12_381_map_fp_to_g1_out_of_gas ( ) {
838826 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
839827 let input = Bytes :: from ( [ 1 ; bls12_381_const:: PADDED_FP_LENGTH ] ) ;
840- let InitialAndFloorGas {
841- initial_total_gas, ..
842- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
828+ let InitialAndFloorGas { initial_total_gas, .. } =
829+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
843830
844831 let ctx = Context :: op ( )
845832 . with_tx (
@@ -848,9 +835,7 @@ fn test_halted_tx_call_bls12_381_map_fp_to_g1_out_of_gas() {
848835 TxEnv :: builder ( )
849836 . kind ( TxKind :: Call ( bls12_381_const:: MAP_FP_TO_G1_ADDRESS ) )
850837 . data ( input)
851- . gas_limit (
852- initial_total_gas + bls12_381_const:: MAP_FP_TO_G1_BASE_GAS_FEE - 1 ,
853- ) ,
838+ . gas_limit ( initial_total_gas + bls12_381_const:: MAP_FP_TO_G1_BASE_GAS_FEE - 1 ) ,
854839 )
855840 . build_fill ( ) ,
856841 )
@@ -882,9 +867,8 @@ fn test_halted_tx_call_bls12_381_map_fp_to_g1_out_of_gas() {
882867fn test_halted_tx_call_bls12_381_map_fp_to_g1_input_wrong_size ( ) {
883868 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
884869 let input = Bytes :: from ( [ 1 ; bls12_381_const:: PADDED_FP_LENGTH ] ) ;
885- let InitialAndFloorGas {
886- initial_total_gas, ..
887- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
870+ let InitialAndFloorGas { initial_total_gas, .. } =
871+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
888872
889873 let ctx = Context :: op ( )
890874 . with_tx (
@@ -925,9 +909,8 @@ fn test_halted_tx_call_bls12_381_map_fp_to_g1_input_wrong_size() {
925909fn test_halted_tx_call_bls12_381_map_fp2_to_g2_out_of_gas ( ) {
926910 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
927911 let input = Bytes :: from ( [ 1 ; bls12_381_const:: PADDED_FP2_LENGTH ] ) ;
928- let InitialAndFloorGas {
929- initial_total_gas, ..
930- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
912+ let InitialAndFloorGas { initial_total_gas, .. } =
913+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
931914
932915 let ctx = Context :: op ( )
933916 . with_tx (
@@ -936,9 +919,7 @@ fn test_halted_tx_call_bls12_381_map_fp2_to_g2_out_of_gas() {
936919 TxEnv :: builder ( )
937920 . kind ( TxKind :: Call ( bls12_381_const:: MAP_FP2_TO_G2_ADDRESS ) )
938921 . data ( input)
939- . gas_limit (
940- initial_total_gas + bls12_381_const:: MAP_FP2_TO_G2_BASE_GAS_FEE - 1 ,
941- ) ,
922+ . gas_limit ( initial_total_gas + bls12_381_const:: MAP_FP2_TO_G2_BASE_GAS_FEE - 1 ) ,
942923 )
943924 . build_fill ( ) ,
944925 )
@@ -1008,9 +989,8 @@ fn test_l1block_load_for_pre_regolith() {
1008989fn test_halted_tx_call_bls12_381_map_fp2_to_g2_input_wrong_size ( ) {
1009990 const SPEC_ID : OpSpecId = OpSpecId :: ISTHMUS ;
1010991 let input = Bytes :: from ( [ 1 ; bls12_381_const:: PADDED_FP2_LENGTH ] ) ;
1011- let InitialAndFloorGas {
1012- initial_total_gas, ..
1013- } = calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
992+ let InitialAndFloorGas { initial_total_gas, .. } =
993+ calculate_initial_tx_gas ( SPEC_ID . into ( ) , & input[ ..] , false , 0 , 0 , 0 ) ;
1014994
1015995 let ctx = Context :: op ( )
1016996 . with_tx (
0 commit comments