From dd581f799cae03db22c141d80b5bdf3376745605 Mon Sep 17 00:00:00 2001 From: bit-aloo Date: Tue, 21 Jan 2025 20:41:34 +0530 Subject: [PATCH] remove jd-does-not-panic-if-jdc-disconnect from ci's mg yaml and mg test from test module --- .github/workflows/mg.yaml | 8 -- .../jds-config.toml | 20 ---- ...-jds-do-not-panic-on-close-connection.json | 36 ------- ...-do-not-panic-if-jdc-close-connection.json | 96 ------------------- ...ds-do-not-panic-if-jdc-close-connection.sh | 9 -- 5 files changed, 169 deletions(-) delete mode 100644 test/config/jds-do-not-panic-if-jdc-close-connection/jds-config.toml delete mode 100644 test/message-generator/mock/job-declarator-mock-for-jds-do-not-panic-on-close-connection.json delete mode 100644 test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.json delete mode 100755 test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.sh diff --git a/.github/workflows/mg.yaml b/.github/workflows/mg.yaml index 7074f00e9..0ae80381f 100644 --- a/.github/workflows/mg.yaml +++ b/.github/workflows/mg.yaml @@ -43,14 +43,6 @@ jobs: - name: Run jds-do-not-fail-on-wrong-tsdatasucc run: sh ./test/message-generator/test/jds-do-not-fail-on-wrong-tsdatasucc/jds-do-not-fail-on-wrong-tsdatasucc.sh - jds-do-not-panic-if-jdc-close-connection: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Run jds-do-not-panic-if-jdc-close-connection - run: sh ./test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.sh - jds-do-not-stackoverflow-when-no-token: runs-on: ubuntu-latest steps: diff --git a/test/config/jds-do-not-panic-if-jdc-close-connection/jds-config.toml b/test/config/jds-do-not-panic-if-jdc-close-connection/jds-config.toml deleted file mode 100644 index acda73227..000000000 --- a/test/config/jds-do-not-panic-if-jdc-close-connection/jds-config.toml +++ /dev/null @@ -1,20 +0,0 @@ -# SRI Pool config -authority_public_key = "9auqWEzQDVyd2oe1JVGFLMLHZtCo2FFqZwtKA5gd9xbuEu7PH72" -authority_secret_key = "mkDLTBBRxdBv998612qipDYoTK3YUrqLe8uWw7gu3iXbSrn2n" -cert_validity_sec = 3600 - -# list of compressed or uncompressed pubkeys for coinbase payout (only supports 1 item in the array at this point) -coinbase_outputs = [ - { output_script_type = "P2WPKH", output_script_value = "036adc3bdf21e6f9a0f0fb0066bf517e5b7909ed1563d6958a10993849a7554075" }, -] - -listen_jd_address = "127.0.0.1:34264" - -core_rpc_url = "" -core_rpc_port = 18332 -core_rpc_user = "" -core_rpc_pass = "" -# Time interval used for JDS mempool update -[mempool_update_interval] -unit = "secs" -value = 1 \ No newline at end of file diff --git a/test/message-generator/mock/job-declarator-mock-for-jds-do-not-panic-on-close-connection.json b/test/message-generator/mock/job-declarator-mock-for-jds-do-not-panic-on-close-connection.json deleted file mode 100644 index 58f1f5deb..000000000 --- a/test/message-generator/mock/job-declarator-mock-for-jds-do-not-panic-on-close-connection.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": "2", - "doc": [ - "This test does", - "Soft mock of JD", - "Sends SetupConnection to the pool and waits for .Success" - ], - "frame_builders": [ - { - "type": "automatic", - "message_id": "test/message-generator/messages/common_messages.json::setup_connection_job_declarator" - } - ], - "actions": [ - { - "message_ids": ["setup_connection_job_declarator"], - "role": "client", - "results": [ - { - "type": "match_message_type", - "value": "0x01" - } - ], - "actiondoc": "This action sends SetupConnection and checks that .Success and SetCoinbase is received" - } - ], - "setup_commands": [], - "execution_commands": [], - "cleanup_commands": [], - "role": "client", - "downstream": { - "ip": "127.0.0.1", - "port": 34264, - "pub_key": "9auqWEzQDVyd2oe1JVGFLMLHZtCo2FFqZwtKA5gd9xbuEu7PH72" - } -} diff --git a/test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.json b/test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.json deleted file mode 100644 index 5da3018cd..000000000 --- a/test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "version": "2", - "doc": [ - "This test does", - "Launch the jd-server", - "Connect JDC", - "Terminate JDC", - "Connect JDC again", - "JDS msut be up when the second JDC do connect" - ], - "frame_builders": [ - ], - "actions": [ - ], - "setup_commands": [ - { - "command": "cargo", - "args": [ - "llvm-cov", - "--no-report", - "run", - "-p", - "jd_server", - "--", - "-c", - "../test/config/jds-do-not-panic-if-jdc-close-connection/jds-config.toml" - ], - "conditions": { - "WithConditions": { - "conditions": [ - { - "output_string": "JD INITIALIZED", - "output_location": "StdOut", - "late_condition": false, - "condition": true - } - ], - "timer_secs": 300, - "warn_no_panic": false - } - } - }, - { - "command": "cargo", - "args": [ - "run", - "../../test/message-generator/mock/job-declarator-mock-for-jds-do-not-panic-on-close-connection.json" - ], - "conditions": { - "WithConditions": { - "conditions": [ - { - "output_string": "MATCHED MESSAGE TYPE 1", - "output_location": "StdOut", - "late_condition": false, - "condition": true - } - ], - "timer_secs": 600, - "warn_no_panic": false - } - } - }, - { - "command": "cargo", - "args": [ - "run", - "../../test/message-generator/mock/job-declarator-mock-for-jds-do-not-panic-on-close-connection.json" - ], - "conditions": { - "WithConditions": { - "conditions": [ - { - "output_string": "MATCHED MESSAGE TYPE 1", - "output_location": "StdOut", - "late_condition": false, - "condition": true - } - ], - "timer_secs": 600, - "warn_no_panic": false - } - } - } - ], - "execution_commands": [ - ], - "cleanup_commands": [ - { - "command": "pkill", - "args": ["-f", "jd_server", "-SIGINT"], - "conditions": "None" - } - ], - "role": "none" -} diff --git a/test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.sh b/test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.sh deleted file mode 100755 index 706f13a75..000000000 --- a/test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.sh +++ /dev/null @@ -1,9 +0,0 @@ -cd roles -cargo llvm-cov --no-report -p jd_server - -cd ../utils/message-generator/ -cargo build - -RUST_LOG=debug cargo run ../../test/message-generator/test/jds-do-not-panic-if-jdc-close-connection/jds-do-not-panic-if-jdc-close-connection.json || { echo 'mg test failed' ; exit 1; } - -sleep 10