Skip to content

Commit eb15017

Browse files
committed
fix: change to status_next in simplicity activation test
23 backports include a change from `status-next` to `status_next` in getdeploymentinfo which is not present in master yet see: ef6a37b
1 parent 867bfe3 commit eb15017

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

test/functional/feature_elements_simplicity_activation.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ def test_activation(self, rpc, activation_height):
4242
assert_equal (decode["versionHex"], "20000000")
4343

4444
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status"], "defined")
45-
# The 1023rd block does not signal, but changes status-next to "started" from "defined"
45+
# The 1023rd block does not signal, but changes status_next to "started" from "defined"
4646
# bitcoin PR #23508 changed bip9 status to the current block instead of the next block
4747
blocks = self.generatetoaddress(rpc, 1, rpc.getnewaddress())
4848
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status"], "defined")
49-
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status-next"], "started")
49+
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status_next"], "started")
5050
assert_equal(rpc.getblockheader(blocks[0])["versionHex"], "20000000")
5151

5252
blocks = self.generatetoaddress(rpc, 127, rpc.getnewaddress())
@@ -73,7 +73,7 @@ def test_activation(self, rpc, activation_height):
7373
# The 128th block then switches from "started" to "locked_in"
7474
blocks = self.generatetoaddress(rpc, 1, rpc.getnewaddress())
7575
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status"], "started")
76-
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status-next"], "locked_in")
76+
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status_next"], "locked_in")
7777
assert_equal(rpc.getblockheader(blocks[0])["versionHex"], "21000000")
7878

7979
# Run through another 128 blocks, which will go from "locked in" to "active" regardless of signalling
@@ -86,7 +86,7 @@ def test_activation(self, rpc, activation_height):
8686
block = block[:7] + "0" + block[8:] # turn off Simplicity signal
8787
rpc.submitblock(block)
8888
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status"], "locked_in")
89-
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status-next"], "active")
89+
assert_equal(rpc.getdeploymentinfo()["deployments"]["simplicity"]["bip9"]["status_next"], "active")
9090

9191
# After the state is "active", signallng stops by default.
9292
blocks = self.generatetoaddress(rpc, 1, self.nodes[0].getnewaddress())

0 commit comments

Comments
 (0)