fix lb + test

ten-protocol · Dec 27, 2023 · 96003ff · 96003ff
1 parent 5d1fd19
commit 96003ff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/manual-deploy-testnet-validator.yml b/.github/workflows/manual-deploy-testnet-validator.yml
@@ -198,8 +198,8 @@ jobs:
           inlineScript: |
             az network nic ip-config address-pool add \
               --address-pool ${{ github.event.inputs.testnet_type }}-backend-pool \
-              --ip-config-name ipconfig${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }} \
-              --nic-name ${{ vars.AZURE_RESOURCE_PREFIX }}-1-${{ GITHUB.RUN_NUMBER }}VMNic \
+              --ip-config-name ipconfig${{ vars.AZURE_RESOURCE_PREFIX }}-${{ github.event.inputs.node_id }}-${{ GITHUB.RUN_NUMBER }} \
+              --nic-name ${{ vars.AZURE_RESOURCE_PREFIX }}-${{ github.event.inputs.node_id }}-${{ GITHUB.RUN_NUMBER }}VMNic \
               --resource-group Testnet \
               --lb-name ${{ github.event.inputs.testnet_type }}-loadbalancer
 
@@ -216,5 +216,4 @@ jobs:
       - name: "Wait until obscuro node is healthy"
         shell: bash
         run: |
-          ./.github/workflows/runner-scripts/wait-node-healthy.sh --host=obscuronode-0-${{ github.event.inputs.testnet_type }}-${{ GITHUB.RUN_NUMBER }}.uksouth.cloudapp.azure.com
-          ./.github/workflows/runner-scripts/wait-node-healthy.sh --host=obscuronode-1-${{ github.event.inputs.testnet_type }}-${{ GITHUB.RUN_NUMBER }}.uksouth.cloudapp.azure.com
+          ./.github/workflows/runner-scripts/wait-node-healthy.sh --host=obscuronode-${{ github.event.inputs.node_id }}-${{ github.event.inputs.testnet_type }}-${{ GITHUB.RUN_NUMBER }}.uksouth.cloudapp.azure.com
diff --git a/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh b/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh
@@ -43,12 +43,12 @@ if [[ -z "${ipconfig_id}" ]]; then
     exit 0
 fi
 
-az network nic ip-config address-pool remove \
-   --address-pool ${pool} \
-   --ip-config-name "${ipconfig_id}" \
-   --nic-name "${nic_id}" \
-   --resource-group Testnet \
-   --lb-name ${lb} \
+#az network nic ip-config address-pool remove \
+#   --address-pool ${pool} \
+#   --ip-config-name "${ipconfig_id}" \
+#   --nic-name "${nic_id}" \
+#   --resource-group Testnet \
+#   --lb-name ${lb} \
 
 
 echo 'Load balancer removed successfully'
diff --git a/go/enclave/nodetype/sequencer.go b/go/enclave/nodetype/sequencer.go
@@ -163,6 +163,8 @@ func (s *sequencer) createGenesisBatch(block *common.L1Block) error {
 		return err
 	}
 
+	// errors in unit test seem to suggest that batch 2 was received before batch 1
+	// this ensures that there is enough gap so that batch 1 is issued before batch 2
 	time.Sleep(time.Second)
 	// produce batch #2 which has the message bus and any other system contracts
 	cb, err := s.produceBatch(