diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3a0c13fdb..c9f3a451e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -224,7 +224,7 @@ jobs: run: | cargo nextest run --archive-file nextest-archive-postgres.tar.zst --verbose --no-fail-fast --nocapture \ --workspace-remap $PWD $(if [ "${{ matrix.version }}" == "2" ]; then echo " smoke"; fi) - timeout-minutes: 20 + timeout-minutes: 10 - name: Dump process compose services logs if: always() diff --git a/process-compose.yaml b/process-compose.yaml index 622fae002..3722b9872 100644 --- a/process-compose.yaml +++ b/process-compose.yaml @@ -355,101 +355,101 @@ processes: exit_on_skipped: true - sequencer5: - command: sequencer-sqlite -- storage-sql -- http -- query -- catchup -- status -- submit -- config - environment: - - ESPRESSO_SEQUENCER_API_PORT=$ESPRESSO_SEQUENCER5_API_PORT - - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_5 - - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=localhost:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_5 - - ESPRESSO_SEQUENCER_API_PEERS=http://localhost:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_STATE_PEERS=http://localhost:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_SQLITE_PATH=$ESPRESSO_BASE_STORAGE_PATH/seq5-sqlite.db - - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_5 - - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_5 - - ESPRESSO_SEQUENCER_IS_DA=true - - ESPRESSO_SEQUENCER_IDENTITY_NODE_NAME=sequencer5 - - ESPRESSO_SEQUENCER_IDENTITY_WALLET_ADDRESS=0x0000000000000000000000000000000000000000 - - ESPRESSO_SEQUENCER_IDENTITY_COMPANY_NAME=Espresso Systems - - ESPRESSO_SEQUENCER_IDENTITY_COMPANY_WEBSITE=https://www.espressosys.com/ - - ESPRESSO_SEQUENCER_IDENTITY_OPERATING_SYSTEM=Linux 5.15.153.1 - - ESPRESSO_SEQUENCER_IDENTITY_NETWORK_TYPE=local - - ESPRESSO_SEQUENCER_IDENTITY_COUNTRY_CODE=US - - ESPRESSO_SEQUENCER_IDENTITY_LATITUDE=40.7128 - - ESPRESSO_SEQUENCER_IDENTITY_LONGITUDE=-74.0060 - - ESPRESSO_SEQUENCER_PUBLIC_API_URL=http://localhost:$ESPRESSO_SEQUENCER5_API_PORT/ - depends_on: - orchestrator: - condition: process_healthy - demo-l1-network: - condition: process_healthy - state-relay-server: - condition: process_healthy - broker_0: - condition: process_healthy - broker_1: - condition: process_healthy - marshal_0: - condition: process_healthy - deploy-sequencer-contracts: - condition: process_completed - availability: - exit_on_skipped: true - - readiness_probe: - http_get: - scheme: http - host: localhost - port: $ESPRESSO_SEQUENCER5_API_PORT - path: /healthcheck - failure_threshold: 100 - - sequencer6: - command: sequencer-sqlite -- storage-sql -- http -- query -- catchup -- status -- state -- explorer - environment: - - ESPRESSO_SEQUENCER_API_PORT=$ESPRESSO_SEQUENCER6_API_PORT - - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_6 - - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=localhost:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_6 - - ESPRESSO_SEQUENCER_API_PEERS=http://localhost:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_STATE_PEERS=http://localhost:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_SQLITE_PATH=$ESPRESSO_BASE_STORAGE_PATH/seq6-sqlite.db - - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_6 - - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_6 - - ESPRESSO_SEQUENCER_IS_DA=true - - ESPRESSO_SEQUENCER_IDENTITY_NODE_NAME=sequencer6 - - ESPRESSO_SEQUENCER_IDENTITY_WALLET_ADDRESS=0x0000000000000000000000000000000000000001 - - ESPRESSO_SEQUENCER_IDENTITY_COMPANY_NAME=Espresso Systems - - ESPRESSO_SEQUENCER_IDENTITY_COMPANY_WEBSITE=https://www.espressosys.com/ - - ESPRESSO_SEQUENCER_IDENTITY_OPERATING_SYSTEM=Darwin 23.5.0 - - ESPRESSO_SEQUENCER_IDENTITY_NETWORK_TYPE=local - - ESPRESSO_SEQUENCER_IDENTITY_COUNTRY_CODE=GR - - ESPRESSO_SEQUENCER_IDENTITY_LATITUDE=39.0742 - - ESPRESSO_SEQUENCER_IDENTITY_LONGITUDE=21.8243 - - ESPRESSO_SEQUENCER_PUBLIC_API_URL=http://localhost:$ESPRESSO_SEQUENCER6_API_PORT/ - - ESPRESSO_SEQUENCER_L1_PROVIDER=ws://localhost:$ESPRESSO_SEQUENCER_L1_WS_PORT - depends_on: - orchestrator: - condition: process_healthy - demo-l1-network: - condition: process_healthy - state-relay-server: - condition: process_healthy - broker_0: - condition: process_healthy - broker_1: - condition: process_healthy - marshal_0: - condition: process_healthy - deploy-sequencer-contracts: - condition: process_completed - readiness_probe: - http_get: - scheme: http - host: localhost - port: $ESPRESSO_SEQUENCER6_API_PORT - path: /healthcheck - failure_threshold: 100 - availability: - exit_on_skipped: true + # sequencer5: + # command: sequencer-sqlite -- storage-sql -- http -- query -- catchup -- status -- submit -- config + # environment: + # - ESPRESSO_SEQUENCER_API_PORT=$ESPRESSO_SEQUENCER5_API_PORT + # - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_5 + # - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=localhost:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_5 + # - ESPRESSO_SEQUENCER_API_PEERS=http://localhost:$ESPRESSO_SEQUENCER_API_PORT + # - ESPRESSO_SEQUENCER_STATE_PEERS=http://localhost:$ESPRESSO_SEQUENCER_API_PORT + # - ESPRESSO_SEQUENCER_SQLITE_PATH=$ESPRESSO_BASE_STORAGE_PATH/seq5-sqlite.db + # - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_5 + # - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_5 + # - ESPRESSO_SEQUENCER_IS_DA=true + # - ESPRESSO_SEQUENCER_IDENTITY_NODE_NAME=sequencer5 + # - ESPRESSO_SEQUENCER_IDENTITY_WALLET_ADDRESS=0x0000000000000000000000000000000000000000 + # - ESPRESSO_SEQUENCER_IDENTITY_COMPANY_NAME=Espresso Systems + # - ESPRESSO_SEQUENCER_IDENTITY_COMPANY_WEBSITE=https://www.espressosys.com/ + # - ESPRESSO_SEQUENCER_IDENTITY_OPERATING_SYSTEM=Linux 5.15.153.1 + # - ESPRESSO_SEQUENCER_IDENTITY_NETWORK_TYPE=local + # - ESPRESSO_SEQUENCER_IDENTITY_COUNTRY_CODE=US + # - ESPRESSO_SEQUENCER_IDENTITY_LATITUDE=40.7128 + # - ESPRESSO_SEQUENCER_IDENTITY_LONGITUDE=-74.0060 + # - ESPRESSO_SEQUENCER_PUBLIC_API_URL=http://localhost:$ESPRESSO_SEQUENCER5_API_PORT/ + # depends_on: + # orchestrator: + # condition: process_healthy + # demo-l1-network: + # condition: process_healthy + # state-relay-server: + # condition: process_healthy + # broker_0: + # condition: process_healthy + # broker_1: + # condition: process_healthy + # marshal_0: + # condition: process_healthy + # deploy-sequencer-contracts: + # condition: process_completed + # availability: + # exit_on_skipped: true + + # readiness_probe: + # http_get: + # scheme: http + # host: localhost + # port: $ESPRESSO_SEQUENCER5_API_PORT + # path: /healthcheck + # failure_threshold: 100 + + # sequencer6: + # command: sequencer-sqlite -- storage-sql -- http -- query -- catchup -- status -- state -- explorer + # environment: + # - ESPRESSO_SEQUENCER_API_PORT=$ESPRESSO_SEQUENCER6_API_PORT + # - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_6 + # - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=localhost:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_6 + # - ESPRESSO_SEQUENCER_API_PEERS=http://localhost:$ESPRESSO_SEQUENCER_API_PORT + # - ESPRESSO_SEQUENCER_STATE_PEERS=http://localhost:$ESPRESSO_SEQUENCER_API_PORT + # - ESPRESSO_SEQUENCER_SQLITE_PATH=$ESPRESSO_BASE_STORAGE_PATH/seq6-sqlite.db + # - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_6 + # - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_6 + # - ESPRESSO_SEQUENCER_IS_DA=true + # - ESPRESSO_SEQUENCER_IDENTITY_NODE_NAME=sequencer6 + # - ESPRESSO_SEQUENCER_IDENTITY_WALLET_ADDRESS=0x0000000000000000000000000000000000000001 + # - ESPRESSO_SEQUENCER_IDENTITY_COMPANY_NAME=Espresso Systems + # - ESPRESSO_SEQUENCER_IDENTITY_COMPANY_WEBSITE=https://www.espressosys.com/ + # - ESPRESSO_SEQUENCER_IDENTITY_OPERATING_SYSTEM=Darwin 23.5.0 + # - ESPRESSO_SEQUENCER_IDENTITY_NETWORK_TYPE=local + # - ESPRESSO_SEQUENCER_IDENTITY_COUNTRY_CODE=GR + # - ESPRESSO_SEQUENCER_IDENTITY_LATITUDE=39.0742 + # - ESPRESSO_SEQUENCER_IDENTITY_LONGITUDE=21.8243 + # - ESPRESSO_SEQUENCER_PUBLIC_API_URL=http://localhost:$ESPRESSO_SEQUENCER6_API_PORT/ + # - ESPRESSO_SEQUENCER_L1_PROVIDER=ws://localhost:$ESPRESSO_SEQUENCER_L1_WS_PORT + # depends_on: + # orchestrator: + # condition: process_healthy + # demo-l1-network: + # condition: process_healthy + # state-relay-server: + # condition: process_healthy + # broker_0: + # condition: process_healthy + # broker_1: + # condition: process_healthy + # marshal_0: + # condition: process_healthy + # deploy-sequencer-contracts: + # condition: process_completed + # readiness_probe: + # http_get: + # scheme: http + # host: localhost + # port: $ESPRESSO_SEQUENCER6_API_PORT + # path: /healthcheck + # failure_threshold: 100 + # availability: + # exit_on_skipped: true node_validator: diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 9493c7b40..f57409671 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -113,8 +113,8 @@ impl TestConfig { let sequencer_clients = [ dotenvy::var("ESPRESSO_SEQUENCER_API_PORT")?, dotenvy::var("ESPRESSO_SEQUENCER1_API_PORT")?, - dotenvy::var("ESPRESSO_SEQUENCER5_API_PORT")?, - dotenvy::var("ESPRESSO_SEQUENCER6_API_PORT")?, + // dotenvy::var("ESPRESSO_SEQUENCER5_API_PORT")?, + // dotenvy::var("ESPRESSO_SEQUENCER6_API_PORT")?, ] .iter() .map(|port| url_from_port(port.clone()).unwrap())