From 68ea28d192c561bfb7144c07bab3ff47ee0e6c1e Mon Sep 17 00:00:00 2001 From: Will Hester Date: Tue, 14 May 2024 15:58:42 +0100 Subject: [PATCH 1/4] add missing postgres config to upgrade script --- .github/workflows/manual-upgrade-testnet-l2.yml | 1 + design/danksharding/proto-danksharding-design.md | 0 integration/tenscan/tenscan_test.go | 9 +++++++++ 3 files changed, 10 insertions(+) create mode 100644 design/danksharding/proto-danksharding-design.md diff --git a/.github/workflows/manual-upgrade-testnet-l2.yml b/.github/workflows/manual-upgrade-testnet-l2.yml index c63a697d24..ecc8e05254 100644 --- a/.github/workflows/manual-upgrade-testnet-l2.yml +++ b/.github/workflows/manual-upgrade-testnet-l2.yml @@ -177,6 +177,7 @@ jobs: -max_batch_interval=${{ vars.L2_MAX_BATCH_INTERVAL }} \ -rollup_interval=${{ vars.L2_ROLLUP_INTERVAL }} \ -l1_chain_id=${{ vars.L1_CHAIN_ID }} \ + -postgres_db_host=postgres://tenuser:${{ secrets.TEN_POSTGRES_USER_PWD }}@postgres-ten-${{ github.event.inputs.testnet_type }}.postgres.database.azure.com:5432/ \ upgrade' check-obscuro-is-healthy: diff --git a/design/danksharding/proto-danksharding-design.md b/design/danksharding/proto-danksharding-design.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/integration/tenscan/tenscan_test.go b/integration/tenscan/tenscan_test.go index 3a75a19522..3effd5d43f 100644 --- a/integration/tenscan/tenscan_test.go +++ b/integration/tenscan/tenscan_test.go @@ -78,6 +78,15 @@ func TestTenscan(t *testing.T) { 5, ) + //Timer for running local tests + countdownDuration := 20 * time.Minute + tickDuration := 30 * time.Second + + for remaining := countdownDuration; remaining > 0; remaining -= tickDuration { + fmt.Printf("Shutting down in %s...\n", remaining) + time.Sleep(tickDuration) + } + // Issue tests statusCode, body, err := fasthttp.Get(nil, fmt.Sprintf("%s/count/contracts/", serverAddress)) assert.NoError(t, err) From 8cf06c0f2c3562c261cfe62d2aa0a9448857bf99 Mon Sep 17 00:00:00 2001 From: Will Hester Date: Tue, 14 May 2024 15:59:02 +0100 Subject: [PATCH 2/4] remove unwanted files --- design/danksharding/proto-danksharding-design.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 design/danksharding/proto-danksharding-design.md diff --git a/design/danksharding/proto-danksharding-design.md b/design/danksharding/proto-danksharding-design.md deleted file mode 100644 index e69de29bb2..0000000000 From 6ba55d2bd1a7680598f8d404f5f0a5815cb7f6a5 Mon Sep 17 00:00:00 2001 From: Will Hester Date: Tue, 14 May 2024 16:00:10 +0100 Subject: [PATCH 3/4] remove testing code --- integration/tenscan/tenscan_test.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/integration/tenscan/tenscan_test.go b/integration/tenscan/tenscan_test.go index 3effd5d43f..3a75a19522 100644 --- a/integration/tenscan/tenscan_test.go +++ b/integration/tenscan/tenscan_test.go @@ -78,15 +78,6 @@ func TestTenscan(t *testing.T) { 5, ) - //Timer for running local tests - countdownDuration := 20 * time.Minute - tickDuration := 30 * time.Second - - for remaining := countdownDuration; remaining > 0; remaining -= tickDuration { - fmt.Printf("Shutting down in %s...\n", remaining) - time.Sleep(tickDuration) - } - // Issue tests statusCode, body, err := fasthttp.Get(nil, fmt.Sprintf("%s/count/contracts/", serverAddress)) assert.NoError(t, err) From 98fe8d62d0b2d50ecff4dcb4143f1d2b3b7a4b9c Mon Sep 17 00:00:00 2001 From: Will Hester Date: Tue, 14 May 2024 16:03:13 +0100 Subject: [PATCH 4/4] add to validator deploy --- .github/workflows/manual-deploy-testnet-validator.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual-deploy-testnet-validator.yml b/.github/workflows/manual-deploy-testnet-validator.yml index cc2222787a..6f2fbb6520 100644 --- a/.github/workflows/manual-deploy-testnet-validator.yml +++ b/.github/workflows/manual-deploy-testnet-validator.yml @@ -1,4 +1,4 @@ -# Deploys an Ten validator on Azure for Testnet +# Deploys a Ten validator on Azure for Testnet # # This script uses GitHub Environments for variables (vars) and secrets - these are configured on GitHub and # the environments match the input.testnet_type options @@ -186,6 +186,7 @@ jobs: -max_batch_interval=${{ vars.L2_MAX_BATCH_INTERVAL }} \ -rollup_interval=${{ vars.L2_ROLLUP_INTERVAL }} \ -l1_chain_id=${{ vars.L1_CHAIN_ID }} \ + -postgres_db_host=postgres://tenuser:${{ secrets.TEN_POSTGRES_USER_PWD }}@postgres-ten-${{ github.event.inputs.testnet_type }}.postgres.database.azure.com:5432/ \ start'