Skip to content

Conversation

@furszy
Copy link

@furszy furszy commented Jun 21, 2021

Built on top of #2427..
Expanded unit test coverage for the blockchain reorg during superblock range (parallel work of #2436), budget proposal payments distribution in different order and the creation of an invalid budget finalization.

@furszy furszy self-assigned this Jun 21, 2021
@furszy furszy force-pushed the 2021_test_budget_reorg_and_payment_order branch from e754977 to 96a4fad Compare June 21, 2021 02:23
@furszy furszy added this to the 6.0.0 milestone Jun 21, 2021
@furszy furszy force-pushed the 2021_test_budget_reorg_and_payment_order branch 4 times, most recently from d88a596 to 9711d99 Compare June 23, 2021 17:31
@furszy furszy requested review from Fuzzbawls and random-zebra and removed request for Fuzzbawls June 24, 2021 15:59
@furszy furszy force-pushed the 2021_test_budget_reorg_and_payment_order branch from 9711d99 to 0961e50 Compare July 12, 2021 22:54
random-zebra
random-zebra previously approved these changes Jul 14, 2021
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. tiertwo_governance_invalid_budget.py could use some more cleanup (removing the unused node minerB, leftover from tiertwo_reorg_mempool.py):

Index: test/functional/tiertwo_governance_invalid_budget.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/test/functional/tiertwo_governance_invalid_budget.py b/test/functional/tiertwo_governance_invalid_budget.py
--- a/test/functional/tiertwo_governance_invalid_budget.py	(revision 0961e50fd575ec00950e2925d4be77a6c144e0bb)
+++ b/test/functional/tiertwo_governance_invalid_budget.py	(date 1626277927433)
@@ -16,19 +16,17 @@
 
     def set_test_params(self):
         self.setup_clean_chain = True
-        # 4 nodes:
+        # 3 nodes:
         # - 1 miner/mncontroller
         # - 2 remote mns
-        # - 1 other node to stake a forked chain
-        self.num_nodes = 4
+        self.num_nodes = 3
         self.extra_args = [["-sporkkey=932HEevBSujW2ud7RfB1YF91AFygbBRQj3de3LyaCRqNzKKgWXi"],
                            [],
-                           ["-listen", "-externalip=127.0.0.1"],
-                           ["-listen", "-externalip=127.0.0.1"],
+                           [],
                            ]
         self.enable_mocktime()
 
-        self.minerAPos = 0
+        self.minerPos = 0
         self.remoteOnePos = 1
         self.remoteTwoPos = 2
 
@@ -39,27 +37,27 @@
         self.mnTwoPrivkey = "92Hkebp3RHdDidGZ7ARgS4orxJAGyFUPDXNqtsYsiwho1HGVRbF"
 
     def run_test(self):
-        self.minerA = self.nodes[self.minerAPos]     # also controller of mn1 and mn2
+        self.miner = self.nodes[self.minerPos]     # also controller of mn1 and mn2
         self.mn1 = self.nodes[self.remoteOnePos]
         self.mn2 = self.nodes[self.remoteTwoPos]
         self.setupContext()
 [...]

@furszy furszy force-pushed the 2021_test_budget_reorg_and_payment_order branch from 0961e50 to 4ca46e4 Compare July 14, 2021 16:17
@furszy
Copy link
Author

furszy commented Jul 14, 2021

Done, squashed it inside the last commit.

@furszy furszy force-pushed the 2021_test_budget_reorg_and_payment_order branch from 4ca46e4 to 6805ee8 Compare July 14, 2021 16:37
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 6805ee8

@random-zebra random-zebra merged commit e20c1d2 into PIVX-Project:master Jul 24, 2021
random-zebra added a commit to random-zebra/PIVX that referenced this pull request Jul 25, 2021
random-zebra added a commit that referenced this pull request Jul 25, 2021
4155b48 [Tests] Fix ProcessNewBlock signature in budget_tests.cpp (random-zebra)

Pull request description:

  broken due to merges of #2438 + #2464

Top commit has no ACKs.

Tree-SHA512: 1df1a7a45be0cdaca9409f2698220dfcf025df2fe784d28bd9d7b084a73718d4fccfad5def3296992f5bb4e78c0fea5860651b28c6e61f1c121a08e4df1e1535
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants