From 8568f459094e2914ad18e51c00402f026caa8287 Mon Sep 17 00:00:00 2001
From: Matthew Zipkin <pinheadmz@gmail.com>
Date: Tue, 22 Oct 2024 09:40:03 -0400
Subject: [PATCH] update signet test

---
 test/data/signet/network.yaml       | 30 +++++++++++++++++++++++++++++
 test/data/signet/node-defaults.yaml |  4 ++--
 test/signet_test.py                 |  6 +++---
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/test/data/signet/network.yaml b/test/data/signet/network.yaml
index 3551db4df..e5e3a4fc2 100644
--- a/test/data/signet/network.yaml
+++ b/test/data/signet/network.yaml
@@ -50,3 +50,33 @@ nodes:
       tag: "0.16.1"
     addnode:
       - miner
+  - name: tank-11
+    image:
+      tag: "98.0.0-invalid-blocks"
+    addnode:
+      - miner
+  - name: tank-12
+    image:
+      tag: "94.0.0-5k-inv"
+    addnode:
+      - miner
+  - name: tank-13
+    image:
+      tag: "95.0.0-disabled-opcodes"
+    addnode:
+      - miner
+  - name: tank-14
+    image:
+      tag: "96.0.0-no-mp-trim"
+    addnode:
+      - miner
+  - name: tank-15
+    image:
+      tag: "97.0.0-50-orphans"
+    addnode:
+      - miner
+  - name: tank-16
+    image:
+      tag: "99.0.0-unknown-message"
+    addnode:
+      - miner
diff --git a/test/data/signet/node-defaults.yaml b/test/data/signet/node-defaults.yaml
index ae51990ed..aea980d6a 100644
--- a/test/data/signet/node-defaults.yaml
+++ b/test/data/signet/node-defaults.yaml
@@ -1,12 +1,12 @@
 image:
   repository: bitcoindevproject/bitcoin
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   tag: "27.0"
 
 chain: signet
 
 spec:
-  restartPolicy: Always
+  restartPolicy: Never
 
 defaultConfig: |
   debug=rpc
diff --git a/test/signet_test.py b/test/signet_test.py
index e71c99c6f..93fa2e484 100755
--- a/test/signet_test.py
+++ b/test/signet_test.py
@@ -37,13 +37,13 @@ def check_signet_miner(self):
             f"bitcoin rpc miner importdescriptors '{json.dumps(self.signer_data['descriptors'])}'"
         )
         self.warnet(
-            f"run resources/scenarios/signet_miner.py --tank=0 generate --min-nbits --address={self.signer_data['address']['address']}"
+            f"run resources/scenarios/signet_miner.py --tank=0 generate --max-blocks=8 --min-nbits --address={self.signer_data['address']['address']}"
         )
 
         def block_one():
-            for n in range(1, 11):
+            for n in range(1, 17):
                 height = int(self.warnet(f"bitcoin rpc tank-{n} getblockcount"))
-                if height != 1:
+                if height < 8:
                     return False
             return True