Revert "cl/split_out_e2e_tests"

This reverts commit 475c743.

yarn-project/end-to-end/Earthfile

@@ -42,141 +42,10 @@ UPLOAD_LOGS:
   ENV COMMIT_HASH=$COMMIT_HASH
   RUN --secret AWS_ACCESS_KEY_ID --secret AWS_SECRET_ACCESS_KEY /usr/src/scripts/logs/upload_logs_to_s3.sh /usr/var/log
 
-e2e_2_pxes:
+# Define e2e tests
+e2e-tests:
   FROM ../+end-to-end
-  RUN yarn test ./src/e2e_2_pxes.test.ts
-
-e2e_account_contracts:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_account_contracts.test.ts
-
-e2e_auth_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_auth_contract.test.ts
-
-e2e_authwit:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_authwit.test.ts
-
-e2e_avm_simulator:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_avm_simulator.test.ts
-
-e2e_blacklist_token_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_blacklist_token_contract
-
-e2e_block_building:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_block_building.test.ts
-
-e2e_card_game:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_card_game.test.ts
-
-e2e_cheat_codes:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_cheat_codes.test.ts
-
-e2e_counter_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_counter_contract.test.ts
-
-e2e_cross_chain_messaging:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_cross_chain_messaging.test.ts
-
-e2e_crowdfunding_and_claim:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_crowdfunding_and_claim.test.ts
-
-e2e_dapp_subscription:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_dapp_subscription.test.ts
-
-e2e_delegate_calls:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_delegate_calls
-
-e2e_deploy_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_deploy_contract
-
-e2e_encryption:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_encryption.test.ts
-
-e2e_escrow_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_escrow_contract.test.ts
-
-e2e_fees:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_fees.test.ts
-
-e2e_key_registry:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_key_registry.test.ts
-
-e2e_lending_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_lending_contract.test.ts
-
-e2e_max_block_number:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_max_block_number.test.ts
-
-e2e_multiple_accounts_1_enc_key:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_multiple_accounts_1_enc_key.test.ts
-
-e2e_nested_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_nested_contract
-
-e2e_non_contract_account:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_non_contract_account.test.ts
-
-e2e_note_getter:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_note_getter.test.ts
-
-e2e_ordering:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_ordering.test.ts
-
-e2e_outbox:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_outbox.test.ts
-
-e2e_pending_note_hashes_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_pending_note_hashes_contract.test.ts
-
-e2e_private_voting_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_private_voting_contract.test.ts
-
-e2e_public_cross_chain_messaging:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_public_cross_chain_messaging
-
-e2e_public_to_private_messaging:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_public_to_private_messaging.test.ts
-
-e2e_state_vars:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_state_vars.test.ts
-
-e2e_static_calls:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_static_calls.test.ts
-
-e2e_token_contract:
-  FROM ../+end-to-end
-  RUN yarn test ./src/e2e_token_contract
+  RUN yarn test ./src/e2e
 
 flakey-e2e-tests:
   FROM ../+end-to-end

yarn-project/end-to-end/package.json

@@ -15,7 +15,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src \"!src/web/main.js\" && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "LOG_LEVEL=${LOG_LEVEL:-verbose} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
+    "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
     "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"",
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --no-cache --runInBand --config jest.integration.config.json"
   },