chore: remove unwanted conway-era merged code

input-output-hk · May 7, 2024 · 3122d3e · 3122d3e
1 parent 7ed07be
commit 3122d3e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 25 deletions.
diff --git a/.github/workflows/continuous-integration-e2e.yaml b/.github/workflows/continuous-integration-e2e.yaml
@@ -30,7 +30,7 @@ env:
 on:
   pull_request:
   push:
-    branches: ['master', 'conway-era']
+    branches: ['master']
     tags: ['*.*.*']
 
 jobs:

diff --git a/.github/workflows/continuous-integration-unit-tests.yaml b/.github/workflows/continuous-integration-unit-tests.yaml
@@ -7,7 +7,7 @@ env:
 on:
   pull_request:
   push:
-    branches: ['master', 'conway-era']
+    branches: ['master']
     tags: ['*.*.*']
 
 jobs:

diff --git a/.github/workflows/std.yml b/.github/workflows/std.yml
@@ -23,11 +23,6 @@ on:
         type: boolean
         required: true
         default: false
-      deploy-dev-sanchonet:
-        description: Deploy to dev-sanchonet
-        type: boolean
-        required: true
-        default: false
   workflow_call:
     inputs:
       deploy-dev-preprod:
@@ -59,7 +54,7 @@ on:
 env:
   # NIX_UPLOAD_CACHE: s3://lace-nix-cache?region=us-east-1
   DISCOVERY_USER_NAME: gha-runner
-  DISCOVERY_KNOWN_HOSTS_ENTRY: '65.109.126.156 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEOVVDZydvD+diYa6A3EtA3WGw5NfN0wv7ckQxa/fX1O'
+  DISCOVERY_KNOWN_HOSTS_ENTRY: "65.109.126.156 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEOVVDZydvD+diYa6A3EtA3WGw5NfN0wv7ckQxa/fX1O"
 concurrency:
   group: std-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -106,9 +101,6 @@ jobs:
             if [ "true" == ${{ inputs.deploy-dev-preview || (github.event_name == 'push' && github.ref_name == 'master') }} ] ; then
               echo '{"environment":"dev-preview", "target":"dev-preview@us-east-1",    "url": "https://dev-preview.lw.iog.io/"}'
             fi
-            if [ "true" == ${{ inputs.deploy-dev-sanchonet || (github.event_name == 'push' && github.ref_name == 'conway-era') }} ] ; then
-              echo '{"environment":"dev-sanchonet", "target":"dev-sanchonet@us-east-1@v1",    "url": "https://dev-sanchonet.lw.iog.io/"}'
-            fi
             if [ "true" == ${{ inputs.deploy-dev-preprod || false }} ] ; then
               echo '{"environment":"dev-preprod", "target":"dev-preprod@us-east-1@v2", "url": "https://dev-preprod.lw.iog.io/"}'
             fi
@@ -125,9 +117,10 @@ jobs:
           # TODO: should we remove the trailing double quotes?
           echo "deployment-matrix=$(cat deployment-matrix.json | jq -c . | jq --raw-input)" >> "$GITHUB_OUTPUT"
       - uses: divnix/std-action/discover@main
-        with: { ffBuildInstructions: true }
+        with: {ffBuildInstructions: true}
         id: discovery
 
+
   images:
     name: ${{ matrix.target.jobName }}
     runs-on: ubuntu-latest
@@ -172,12 +165,13 @@ jobs:
           echo commit: ${{ github.sha }}
       - uses: divnix/std-action/run@main
         if: matrix.target != 'dummy-target'
-        with: { ffBuildInstructions: true, remoteStore: 'ssh-ng://eu.nixbuild.net' }
+        with: {ffBuildInstructions: true, remoteStore: "ssh-ng://eu.nixbuild.net"}
+
 
   diff:
     needs: images
     name: Diff & Comment
-    if: github.event_name == 'pull_request' && (github.base_ref == 'master' || github.base_ref == 'conway-era')
+    if: github.event_name == 'pull_request' && (github.base_ref == 'master')
     permissions:
       contents: read
       pull-requests: write
@@ -222,10 +216,9 @@ jobs:
             printf "" >pr-comment.md
 
             for target in \
-              ${{ github.base_ref == 'master' && '"dev-preview@us-east-1"'    || '' }} \
-              ${{ github.base_ref == 'master' && '"dev-preprod@us-east-1@v2"' || '' }} \
-              ${{ github.base_ref == 'master' && '"dev-mainnet@us-east-1"'    || '' }} \
-              ${{ github.base_ref == 'conway-era' && '"dev-sanchonet@us-east-1@v1"'    || '' }} \
+              "dev-preview@us-east-1" \
+              "dev-preprod@us-east-1@v2" \
+              "dev-mainnet@us-east-1" \
             ; do
               nix run -L ".#cardano-services.${target}.plan" | tee k8s-plan.diff
 
@@ -245,7 +238,7 @@ jobs:
       - name: Post Comment on the PR
         env:
           GH_TOKEN: ${{ github.token }}
-          COMMENT_MARKER: 'nix-helm-diff-777f3796-c80d-4d68-bf4f-8faad564f03f'
+          COMMENT_MARKER: "nix-helm-diff-777f3796-c80d-4d68-bf4f-8faad564f03f"
         run: |
           prNumber=$(cut -d/ -f1 <<<'${{ github.ref_name }}')
           # The `gh` command doesn’t return numeric comment ids, but instead node_ids, which don’t work with the regular API
@@ -271,8 +264,9 @@ jobs:
               -d "$(jq --null-input --arg body "$(cat pr-comment.md) <!-- $COMMENT_MARKER -->" '{body: $body}')"
           fi
 
+
   deploy:
-    needs: [images, discover]
+    needs: [images,discover]
     concurrency:
       # Only one deployment at a time per environment, and wait for the previous one to finish:
       group: deploy-${{ matrix.environment }}

diff --git a/compose/common.yml b/compose/common.yml
@@ -66,7 +66,7 @@ x-provider-server-environment: &provider-server-environment
   SERVICE_NAMES: ${SERVICE_NAMES:-asset,chain-history,handle,network-info,rewards,stake-pool,tx-submit,utxo}
   SUBMIT_API_URL: ${SUBMIT_API_URL:-http://cardano-submit-api:8090/}
   USE_BLOCKFROST: ${USE_BLOCKFROST:-false}
-  USE_SUBMIT_API: ${USE_SUBMIT_API:-true}
+  USE_SUBMIT_API: ${USE_SUBMIT_API:-false}
 
 x-sdk-environment: &sdk-environment
   LOGGER_MIN_SEVERITY: ${LOGGER_MIN_SEVERITY:-info}
@@ -128,7 +128,7 @@ services:
     <<:
       - *logging
       - *with-postgres
-    image: ghcr.io/intersectmbo/cardano-smash-server:${CARDANO_DB_SYNC_VERSION:-13.1.0.2}
+    image: ghcr.io/intersectmbo/cardano-smash-server:${CARDANO_DB_SYNC_VERSION:-13.2.0.2}
     command: ['--config', '/config/cardano-db-sync/config.json']
     environment:
       POSTGRES_HOST: postgres

diff --git a/packages/cardano-services/test/StakePool/StakePoolHttpService.test.ts b/packages/cardano-services/test/StakePool/StakePoolHttpService.test.ts
@@ -962,7 +962,7 @@ describe('StakePoolHttpService', () => {
               expect(response.pageResults).toEqual(responseCached.pageResults);
               expect(response.pageResults[0].status).toEqual(Cardano.StakePoolStatus.Activating);
             });
-            it.skip('pledgeMet false, status activating, and condition', async () => {
+            it('pledgeMet false, status activating, and condition', async () => {
               const activating = await fixtureBuilder.getPools(1, {
                 with: [PoolWith.ActivatingState, PoolWith.PledgeNotMet]
               });

diff --git a/packages/e2e/test/wallet/PersonalWallet/handle.test.ts b/packages/e2e/test/wallet/PersonalWallet/handle.test.ts
@@ -32,8 +32,7 @@ const toHex = (value: string) =>
     .map((s) => s.charCodeAt(0).toString(16))
     .join('');
 
-// TODO: LW-9889 Ada handle tests fail intermittently with `DeserialiseFailure 56 "expected word"` returned by cardano-submit-api
-describe.skip('Ada handle', () => {
+describe('Ada handle', () => {
   let wallet: BaseWallet;
   let keyAgent: KeyAgent;
   let receivingWallet: BaseWallet;