[BUG][Tests] Fix remote nodes switched ports in PivxTier2TestFramework

random-zebra · Fuzzbawls · commit 6377883cac4a · 2020-12-26T22:05:16.000-08:00
Github-Pull: #2103 Rebased-From: b878bff
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
@@ -55,7 +55,7 @@ OperationResult initMasternode(const std::string& _strMasterNodePrivKey, const s
 
     // Peer port needs to match the masternode public one for IPv4 and IPv6.
     // Onion can run in other ports because those are behind a hidden service which has the public port fixed to the default port.
-    if (nPort != GetListenPort() && !addrTest.IsTor() && !params.IsRegTestNet()) {
+    if (nPort != GetListenPort() && !addrTest.IsTor()) {
         return errorOut(strprintf(_("Invalid -masternodeaddr port %d, isn't the same as the peer port %d"),
                                   nPort, GetListenPort()));
     }
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
@@ -1208,8 +1208,8 @@ def setup_2_masternodes_network(self):
         self.stake(1)
         time.sleep(3)
         self.advance_mocktime(10)
-        remoteOnePort = p2p_port(self.remoteTwoPos)
-        remoteTwoPort = p2p_port(self.remoteOnePos)
+        remoteOnePort = p2p_port(self.remoteOnePos)
+        remoteTwoPort = p2p_port(self.remoteTwoPos)
         self.remoteOne.initmasternode(self.mnOnePrivkey, "127.0.0.1:"+str(remoteOnePort))
         self.remoteTwo.initmasternode(self.mnTwoPrivkey, "127.0.0.1:"+str(remoteTwoPort))
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ OperationResult initMasternode(const std::string& _strMasterNodePrivKey, const s`
`55`	`55`
`56`	`56`	`// Peer port needs to match the masternode public one for IPv4 and IPv6.`
`57`	`57`	`// Onion can run in other ports because those are behind a hidden service which has the public port fixed to the default port.`
`58`		`- if (nPort != GetListenPort() && !addrTest.IsTor() && !params.IsRegTestNet()) {`
	`58`	`+ if (nPort != GetListenPort() && !addrTest.IsTor()) {`
`59`	`59`	`return errorOut(strprintf(_("Invalid -masternodeaddr port %d, isn't the same as the peer port %d"),`
`60`	`60`	`nPort, GetListenPort()));`
`61`	`61`	`}`