ci: Update broken e2e tests (#470)

txpipe · Nov 16, 2022 · 049ea64 · 049ea64
1 parent afb200a
commit 049ea64
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/...e2e/assert-n2c-testnet-origin-blocks.yaml → ...e2e/assert-n2c-preview-origin-blocks.yaml b/...e2e/assert-n2c-testnet-origin-blocks.yaml → ...e2e/assert-n2c-preview-origin-blocks.yaml
@@ -8,7 +8,7 @@ data:
     [source]
     type = "N2C"
     address = ["Unix", "/opt/cardano/cnode/sockets/node0.socket"]
-    magic = "testnet"
+    magic = "preview"
     min_depth = 6
 
     [source.mapper]
@@ -67,7 +67,7 @@ spec:
           args:
             [
               "UNIX-LISTEN:/opt/cardano/cnode/sockets/node0.socket,reuseaddr,fork",
-              "TCP-CONNECT:node-0.nodes.testnet.svc.cluster.local:3307",
+              "TCP-CONNECT:node-preview-1-35-3-0.nodes.ftr-nodes-v0.svc.cluster.local:3307",
             ]
           volumeMounts:
             - name: unix-socket

diff --git a/...ub/e2e/assert-n2c-testnet-tip-blocks.yaml → ...ub/e2e/assert-n2c-preview-tip-blocks.yaml b/...ub/e2e/assert-n2c-testnet-tip-blocks.yaml → ...ub/e2e/assert-n2c-preview-tip-blocks.yaml
@@ -8,7 +8,7 @@ data:
     [source]
     type = "N2C"
     address = ["Unix", "/opt/cardano/cnode/sockets/node0.socket"]
-    magic = "testnet"
+    magic = "preview"
     min_depth = 6
 
     [source.retry_policy]
@@ -64,7 +64,7 @@ spec:
           args:
             [
               "UNIX-LISTEN:/opt/cardano/cnode/sockets/node0.socket,reuseaddr,fork",
-              "TCP-CONNECT:node-0.nodes.testnet.svc.cluster.local:3307",
+              "TCP-CONNECT:node-preview-1-35-3-0.nodes.ftr-nodes-v0.svc.cluster.local:3307",
             ]
           volumeMounts:
             - name: unix-socket

diff --git a/...e2e/assert-n2n-testnet-origin-blocks.yaml → ...e2e/assert-n2n-preview-origin-blocks.yaml b/...e2e/assert-n2n-testnet-origin-blocks.yaml → ...e2e/assert-n2n-preview-origin-blocks.yaml
@@ -7,8 +7,8 @@ data:
   daemon.toml: |-
     [source]
     type = "N2N"
-    address = ["Tcp", "relays-new.cardano-testnet.iohkdev.io:3001"]
-    magic = "testnet"
+    address = ["Tcp", "preview-node.world.dev.cardano.org:30002"]
+    magic = "preview"
 
     [source.finalize]
     max_block_quantity = 2000

diff --git a/...ub/e2e/assert-n2n-testnet-tip-blocks.yaml → ...ub/e2e/assert-n2n-preview-tip-blocks.yaml b/...ub/e2e/assert-n2n-testnet-tip-blocks.yaml → ...ub/e2e/assert-n2n-preview-tip-blocks.yaml
@@ -7,8 +7,8 @@ data:
   daemon.toml: |-
     [source]
     type = "N2N"
-    address = ["Tcp", "relays-new.cardano-testnet.iohkdev.io:3001"]
-    magic = "testnet"
+    address = ["Tcp", "preview-node.world.dev.cardano.org:30002"]
+    magic = "preview"
     min_depth = 6
 
     [source.finalize]

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -71,12 +71,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: assert-n2c-testnet-origin-blocks
-          - name: assert-n2c-testnet-tip-blocks
+          - name: assert-n2c-preview-origin-blocks
+          - name: assert-n2c-preview-tip-blocks
           - name: assert-n2n-mainnet-origin-blocks
           - name: assert-n2n-mainnet-tip-blocks
-          - name: assert-n2n-testnet-origin-blocks
-          - name: assert-n2n-testnet-tip-blocks
+          - name: assert-n2n-preview-origin-blocks
+          - name: assert-n2n-preview-tip-blocks
           - name: aws-lambda-10-blocks
           - name: aws-s3-500-blocks
           - name: aws-sqs-10-blocks

diff --git a/src/sinks/assert/checks.rs b/src/sinks/assert/checks.rs
@@ -11,7 +11,10 @@ pub(crate) fn block_depth_doesnt_skip_numbers(state: &State) -> Outcome {
 
 pub(crate) fn block_slot_increases(state: &State) -> Outcome {
     match (&state.previous_block, &state.current_block) {
-        (Some(prev), Some(curr)) => Outcome::from(prev.slot < curr.slot),
+        (Some(prev), Some(curr)) => match curr.era {
+            crate::model::Era::Byron => Outcome::from(prev.slot <= curr.slot),
+            _ => Outcome::from(prev.slot < curr.slot),
+        },
         _ => Outcome::Unknown,
     }
 }