Remove dead old fixtures generating code, remove 'new' infix from new…

… fixtures (#318)

This is a PR on top of #317

ethereum/circuits/lib/src/account_int_test.nr

@@ -4,13 +4,13 @@ use crate::fixtures::mainnet::{
     paris::{
     usdc_circle::{
     header::{number, state_root, block_header_partial, block_header_rlp}, account::{account, address},
-    state_proof_new::proof_input_serialized as state_proof_input_serialized
+    state_proof::proof_input_serialized as state_proof_input_serialized
 }
 },
     london::vitalik_balance::{
     account::{account as account_from_different_header, address as address_from_different_header},
     header::state_root as state_root_from_different_header,
-    state_proof_new::proof_input_serialized as state_proof_input_from_different_header_serialized
+    state_proof::proof_input_serialized as state_proof_input_from_different_header_serialized
 }
 };
 use dep::std::test::OracleMock;

ethereum/circuits/lib/src/account_with_storage_int_test.nr

@@ -5,8 +5,8 @@ use crate::fixtures::mainnet::{
     paris::{
     usdc_circle::{
     header::{number, block_header_partial, block_header_rlp}, account::{account, address},
-    state_proof_new::proof_input_serialized as state_proof_input_serialized,
-    storage_proof_new::proofs_serialized, storage::{values, keys as storage_keys}
+    state_proof::proof_input_serialized as state_proof_input_serialized,
+    storage_proof::proofs_serialized, storage::{values, keys as storage_keys}
 },
     usdc_uniswap::{storage::keys as usdc_uniswap_storage_keys}
 },
@@ -17,7 +17,7 @@ use crate::fixtures::mainnet::{
     block_header_rlp as crypto_punks_block_header_rlp, number as crypto_punks_number
 },
     account::{address as crypto_punks_address, account as crypto_punks_account},
-    state_proof_new::proof_input_serialized as crypto_punks_state_proof_input_serialized
+    state_proof::proof_input_serialized as crypto_punks_state_proof_input_serialized
 }
 }
 };

ethereum/circuits/lib/src/fixtures/mainnet/cancun/approve.nr

@@ -1,6 +1,6 @@
 mod header;
-mod receipt_proof_new;
+mod receipt_proof;
 mod receipt;
 mod transaction;
-mod transaction_proof_new;
+mod transaction_proof;
 mod log;

ethereum/circuits/lib/src/fixtures/mainnet/cancun/small_block.nr

@@ -1,6 +1,6 @@
 mod header;
-mod receipt_proof_new;
+mod receipt_proof;
 mod receipt;
 mod transaction;
-mod transaction_proof_new;
+mod transaction_proof;
 mod log;

ethereum/circuits/lib/src/fixtures/mainnet/cancun/transfer.nr

@@ -1,4 +1,4 @@
-mod receipt_proof_new;
+mod receipt_proof;
 mod receipt;
 mod transaction;
-mod transaction_proof_new;
+mod transaction_proof;

ethereum/circuits/lib/src/fixtures/mainnet/frontier/first.nr

@@ -1,3 +1,3 @@
 mod header;
 mod account;
-mod state_proof_new;
+mod state_proof;

ethereum/circuits/lib/src/fixtures/mainnet/frontier/zero.nr

@@ -1,3 +1,3 @@
 mod header;
 mod account;
-mod state_proof_new;
+mod state_proof;

ethereum/circuits/lib/src/fixtures/mainnet/homestead/fork.nr

@@ -1,5 +1,5 @@
 mod header;
-mod receipt_proof_new;
+mod receipt_proof;
 mod receipt;
 mod transaction;
-mod transaction_proof_new;
+mod transaction_proof;

ethereum/circuits/lib/src/fixtures/mainnet/london/crypto_punks.nr

@@ -1,5 +1,5 @@
 mod header;
 mod account;
-mod state_proof_new;
+mod state_proof;
 mod storage;
-mod storage_proof_new;
+mod storage_proof;

ethereum/circuits/lib/src/fixtures/mainnet/london/vitalik_balance.nr

@@ -1,3 +1,3 @@
 mod header;
 mod account;
-mod state_proof_new;
+mod state_proof;

ethereum/circuits/lib/src/fixtures/mainnet/paris/bored_ape_yacht_club.nr

@@ -1,5 +1,5 @@
 mod header;
 mod account;
-mod state_proof_new;
+mod state_proof;
 mod storage;
-mod storage_proof_new;
+mod storage_proof;

ethereum/circuits/lib/src/fixtures/mainnet/paris/nouns.nr

@@ -1,5 +1,5 @@
 mod header;
 mod account;
-mod state_proof_new;
+mod state_proof;
 mod storage;
-mod storage_proof_new;
+mod storage_proof;

ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_circle.nr

@@ -1,5 +1,5 @@
 mod header;
 mod account;
-mod state_proof_new;
+mod state_proof;
 mod storage;
-mod storage_proof_new;
+mod storage_proof;

ethereum/circuits/lib/src/fixtures/mainnet/paris/usdc_uniswap.nr

@@ -1,4 +1,4 @@
 mod account;
-mod state_proof_new;
+mod state_proof;
 mod storage;
-mod storage_proof_new;
+mod storage_proof;

ethereum/circuits/lib/src/log_int_test.nr

@@ -7,7 +7,7 @@ use crate::{
     small_block::{
     header::{number, block_header_partial, block_header_rlp, hash},
     receipt::{tx_type, foreign_call_receipt}, transaction::tx_idx,
-    receipt_proof_new::proof_input_serialized, log::{log_idx, log}
+    receipt_proof::proof_input_serialized, log::{log_idx, log}
 },
     approve::header::{block_header_partial as another_block_header_partial, block_header_rlp as another_block_header_rlp}
 }

ethereum/circuits/lib/src/merkle_patricia_proofs/proof_test.nr

@@ -355,24 +355,24 @@ mod verify_merkle_proof {
     use crate::fixtures::mainnet::{
         homestead::fork::{
         header::receipts_root as homestead_receipts_root,
-        receipt_proof_new::proof_input as homestead_receipt_proof_input,
+        receipt_proof::proof_input as homestead_receipt_proof_input,
         header::transactions_root as homestead_transactions_root,
-        transaction_proof_new::proof_input as homestead_transaction_proof_input
+        transaction_proof::proof_input as homestead_transaction_proof_input
     },
         cancun::small_block::{
         header::receipts_root as cancun_receipts_root,
-        receipt_proof_new::proof_input as cancun_receipt_proof_input,
+        receipt_proof::proof_input as cancun_receipt_proof_input,
         header::transactions_root as cancun_transactions_root,
-        transaction_proof_new::proof_input as cancun_transaction_proof_input
+        transaction_proof::proof_input as cancun_transaction_proof_input
     },
-        london::crypto_punks::{state_proof_new::proof_input as london_state_proof_input, header::state_root as london_state_root},
-        paris::bored_ape_yacht_club::{state_proof_new::proof_input as paris_state_proof_input, header::state_root as paris_state_root},
+        london::crypto_punks::{state_proof::proof_input as london_state_proof_input, header::state_root as london_state_root},
+        paris::bored_ape_yacht_club::{state_proof::proof_input as paris_state_proof_input, header::state_root as paris_state_root},
         paris::usdc_circle::{
-        storage_proof_new::proofs as paris_circle_storage_proof_inputs,
+        storage_proof::proofs as paris_circle_storage_proof_inputs,
         account::storage_root as paris_circle_storage_root
     },
         paris::usdc_uniswap::{
-        storage_proof_new::proofs as paris_uniswap_storage_proof_inputs,
+        storage_proof::proofs as paris_uniswap_storage_proof_inputs,
         account::storage_root as paris_uniswap_storage_root
     }
     };

ethereum/circuits/lib/src/receipt_int_test.nr

@@ -3,7 +3,7 @@ use crate::fixtures::mainnet::{
     cancun::small_block::{
     header::{number, block_header_partial, block_header_rlp},
     receipt::{tx_type, receipt, foreign_call_receipt}, transaction::tx_idx,
-    receipt_proof_new::proof_input_serialized
+    receipt_proof::proof_input_serialized
 },
     cancun::approve::{
     header::{
@@ -15,7 +15,7 @@ use crate::fixtures::mainnet::{
     foreign_call_receipt as another_foreign_call_receipt
 },
     transaction::tx_idx as another_tx_idx,
-    receipt_proof_new::proof_input_serialized as another_proof_input_serialized
+    receipt_proof::proof_input_serialized as another_proof_input_serialized
 }
 };
 use dep::std::test::OracleMock;

ethereum/circuits/lib/src/serde_test.nr

@@ -102,7 +102,7 @@ mod account_within_block {
 mod storage_within_block {
     use crate::serde::{STORAGE_BLOCK_LEN, ACCOUNT_LEN};
     use crate::account_with_storage::StorageWithinBlock;
-    use crate::fixtures::mainnet::paris::usdc_circle::{account::account, header::hash, storage_proof_new::proofs, storage::values};
+    use crate::fixtures::mainnet::paris::usdc_circle::{account::account, header::hash, storage_proof::proofs, storage::values};
     use crate::misc::{types::BYTES32_LENGTH, arrays::sub_array_equals};
 
     #[test]
@@ -130,7 +130,7 @@ mod storage_within_block {
 }
 
 mod nodes {
-    use crate::fixtures::mainnet::cancun::small_block::receipt_proof_new::proof_input;
+    use crate::fixtures::mainnet::cancun::small_block::receipt_proof::proof_input;
     use crate::merkle_patricia_proofs::proof::MAX_NODE_LEN;
     use crate::misc::arrays::sub_array_equals;
     use crate::serde::{deserialize_receipt_nodes, serialize_receipt_nodes};
@@ -153,7 +153,7 @@ mod nodes {
 }
 
 mod proof {
-    use crate::fixtures::mainnet::cancun::small_block::receipt_proof_new::proof_input;
+    use crate::fixtures::mainnet::cancun::small_block::receipt_proof::proof_input;
     use crate::receipt::MAX_DEPTH_NO_LEAF as RECEIPT_MAX_DEPTH_NO_LEAF;
     use crate::serde::{Serde, serialize_receipt_nodes, RECEIPT_MAX_LEAF_LEN_M, RECEIPT_NODES_LEN};
     use crate::merkle_patricia_proofs::proof::Proof;
@@ -174,7 +174,7 @@ mod proof {
 }
 
 mod proof_input {
-    use crate::fixtures::mainnet::cancun::small_block::receipt_proof_new::proof_input;
+    use crate::fixtures::mainnet::cancun::small_block::receipt_proof::proof_input;
     use crate::receipt::{MAX_DEPTH_NO_LEAF as RECEIPT_MAX_DEPTH_NO_LEAF, MAX_LEAF_LEN_M as RECEIPT_MAX_LEAF_LEN_M};
     use crate::serde::{Serde, RECEIPT_MAX_PREFIXED_KEY_NIBBLE_LEN, RECEIPT_MAX_VALUE_LEN_M};
     use crate::misc::arrays::sub_array_equals;

ethereum/circuits/lib/src/transaction_int_test.nr

@@ -3,7 +3,7 @@ use crate::fixtures::mainnet::{
     cancun::small_block::{
     header::{number, block_header_partial, block_header_rlp},
     transaction::{tx_idx, tx_type, transaction, foreign_call_transaction},
-    transaction_proof_new::proof_input_serialized
+    transaction_proof::proof_input_serialized
 },
     homestead::fork::{
     header::{
@@ -14,7 +14,7 @@ use crate::fixtures::mainnet::{
     tx_idx as another_tx_idx, tx_type as another_tx_type,
     foreign_call_transaction as another_foreign_call_transaction
 },
-    transaction_proof_new::proof_input_serialized as another_proof_input_serialized
+    transaction_proof::proof_input_serialized as another_proof_input_serialized
 }
 };
 use dep::std::test::OracleMock;

ethereum/circuits/lib/src/verifiers/account_test.nr

@@ -3,7 +3,7 @@ use crate::fixtures::{
     mainnet::london::{
     crypto_punks::{
     account::{rlp_encoded_left_padded_account, account, address, balance, storage_root, code_hash, nonce},
-    header::state_root, state_proof_new::proof_input as state_proof_input
+    header::state_root, state_proof::proof_input as state_proof_input
 }
 }
 };

ethereum/circuits/lib/src/verifiers/receipt_test.nr

@@ -2,7 +2,7 @@ use crate::fixtures::mainnet::{
     cancun::{
     small_block::{
     receipt::{encoded_receipt, receipt, tx_type}, header::{number as block_number, receipts_root},
-    receipt_proof_new::proof_input, transaction::tx_idx
+    receipt_proof::proof_input, transaction::tx_idx
 },
     access_list::header::receipts_root as access_list_receipts_root
 },
@@ -12,7 +12,7 @@ use crate::fixtures::mainnet::{
     receipt as pre_byzantium_receipt
 },
     header::{number as pre_byzantium_block_number, receipts_root as pre_byzantium_receipt_root},
-    receipt_proof_new::proof_input as pre_byzantium_receipt_proof_input
+    receipt_proof::proof_input as pre_byzantium_receipt_proof_input
 }
 };
 use crate::verifiers::receipt::{BYZANTIUM_BLOCK_NUM, assert_receipt_equals, assert_receipt_rlp_equals, verify_receipt};

ethereum/circuits/lib/src/verifiers/storage_test.nr

@@ -1,4 +1,4 @@
-use crate::fixtures::mainnet::paris::usdc_circle::{storage_proof_new::proofs, account::storage_root};
+use crate::fixtures::mainnet::paris::usdc_circle::{storage_proof::proofs, account::storage_root};
 use crate::verifiers::storage::verify_storage_values;
 
 #[test]

ethereum/circuits/lib/src/verifiers/transaction_test.nr

@@ -32,15 +32,15 @@ mod verify_tx {
     use crate::misc::arrays::alter_array;
     use crate::fixtures::mainnet::{
         cancun::small_block::{
-        transaction::{transaction, encoded_tx, tx_type, tx_idx}, transaction_proof_new::proof_input,
+        transaction::{transaction, encoded_tx, tx_type, tx_idx}, transaction_proof::proof_input,
         header::transactions_root
     },
         homestead::fork::{
         transaction::{
         transaction as legacy_transaction, encoded_tx as legacy_encoded_tx, tx_type as legacy_tx_type,
         tx_idx as legacy_tx_idx
     },
-        transaction_proof_new::proof_input as legacy_proof_input,
+        transaction_proof::proof_input as legacy_proof_input,
         header::transactions_root as legacy_transactions_root
     }
     };