Revert "Code split"

This reverts commit 104c3ec. Some cleanup and documenting Cleanup; document more nit ConnectIps test Better connectIps test; simplify ConnectionController tests refactor
deso-protocol · Jan 23, 2024 · 143dcfc · 143dcfc
1 parent 62c9cbb
commit 143dcfc
Show file tree

Hide file tree

Showing 10 changed files with 843 additions and 53 deletions.
diff --git a/integration_testing/connection_controller_routines_test.go b/integration_testing/connection_controller_routines_test.go
diff --git a/integration_testing/connection_controller_utils_test.go b/integration_testing/connection_controller_utils_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/deso-protocol/core/lib"
 	"os"
 	"testing"
+	"time"
 )
 
 func waitForValidatorConnection(t *testing.T, node1 *cmd.Node, node2 *cmd.Node) {
@@ -26,14 +27,24 @@ func waitForValidatorConnection(t *testing.T, node1 *cmd.Node, node2 *cmd.Node)
 		}
 		return true
 	}
-	waitForCondition(t, fmt.Sprintf("Waiting for Node (%s) to connect to outbound non-validator Node (%s)", userAgentN1, userAgentN2), n1ValidatedN2)
+	waitForCondition(t, fmt.Sprintf("Waiting for Node (%s) to connect to validator Node (%s)", userAgentN1, userAgentN2), n1ValidatedN2)
 }
 
 func waitForNonValidatorOutboundConnection(t *testing.T, node1 *cmd.Node, node2 *cmd.Node) {
 	userAgentN1 := node1.Params.UserAgent
+	userAgentN2 := node2.Params.UserAgent
+	condition := conditionNonValidatorOutboundConnection(t, node1, node2)
+	waitForCondition(t, fmt.Sprintf("Waiting for Node (%s) to connect to outbound non-validator Node (%s)", userAgentN1, userAgentN2), condition)
+}
+
+func conditionNonValidatorOutboundConnection(t *testing.T, node1 *cmd.Node, node2 *cmd.Node) func() bool {
+	return conditionNonValidatorOutboundConnectionDynamic(t, node1, node2, false)
+}
+
+func conditionNonValidatorOutboundConnectionDynamic(t *testing.T, node1 *cmd.Node, node2 *cmd.Node, inactiveValidator bool) func() bool {
 	userAgentN2 := node2.Params.UserAgent
 	rnManagerN1 := node1.Server.GetConnectionController().GetRemoteNodeManager()
-	n1ValidatedN2 := func() bool {
+	return func() bool {
 		if true != checkRemoteNodeIndexerUserAgent(rnManagerN1, userAgentN2, false, true, false) {
 			return false
 		}
@@ -44,19 +55,29 @@ func waitForNonValidatorOutboundConnection(t *testing.T, node1 *cmd.Node, node2
 		if !rnFromN2.IsHandshakeCompleted() {
 			return false
 		}
-		if rnFromN2.GetValidatorPublicKey() != nil {
-			return false
+		// inactiveValidator should have the public key.
+		if inactiveValidator {
+			return rnFromN2.GetValidatorPublicKey() != nil
 		}
-		return true
+		return rnFromN2.GetValidatorPublicKey() == nil
 	}
-	waitForCondition(t, fmt.Sprintf("Waiting for Node (%s) to connect to outbound non-validator Node (%s)", userAgentN1, userAgentN2), n1ValidatedN2)
 }
 
 func waitForNonValidatorInboundConnection(t *testing.T, node1 *cmd.Node, node2 *cmd.Node) {
 	userAgentN1 := node1.Params.UserAgent
+	userAgentN2 := node2.Params.UserAgent
+	condition := conditionNonValidatorInboundConnection(t, node1, node2)
+	waitForCondition(t, fmt.Sprintf("Waiting for Node (%s) to connect to inbound non-validator Node (%s)", userAgentN1, userAgentN2), condition)
+}
+
+func conditionNonValidatorInboundConnection(t *testing.T, node1 *cmd.Node, node2 *cmd.Node) func() bool {
+	return conditionNonValidatorInboundConnectionDynamic(t, node1, node2, false)
+}
+
+func conditionNonValidatorInboundConnectionDynamic(t *testing.T, node1 *cmd.Node, node2 *cmd.Node, inactiveValidator bool) func() bool {
 	userAgentN2 := node2.Params.UserAgent
 	rnManagerN1 := node1.Server.GetConnectionController().GetRemoteNodeManager()
-	n1ValidatedN2 := func() bool {
+	return func() bool {
 		if true != checkRemoteNodeIndexerUserAgent(rnManagerN1, userAgentN2, false, false, true) {
 			return false
 		}
@@ -67,12 +88,12 @@ func waitForNonValidatorInboundConnection(t *testing.T, node1 *cmd.Node, node2 *
 		if !rnFromN2.IsHandshakeCompleted() {
 			return false
 		}
-		if rnFromN2.GetValidatorPublicKey() != nil {
-			return false
+		// inactiveValidator should have the public key.
+		if inactiveValidator {
+			return rnFromN2.GetValidatorPublicKey() != nil
 		}
-		return true
+		return rnFromN2.GetValidatorPublicKey() == nil
 	}
-	waitForCondition(t, fmt.Sprintf("Waiting for Node (%s) to connect to inbound non-validator Node (%s)", userAgentN1, userAgentN2), n1ValidatedN2)
 }
 
 func waitForEmptyRemoteNodeIndexer(t *testing.T, node1 *cmd.Node) {
@@ -90,15 +111,15 @@ func waitForEmptyRemoteNodeIndexer(t *testing.T, node1 *cmd.Node) {
 func waitForCountRemoteNodeIndexer(t *testing.T, node1 *cmd.Node, allCount int, validatorCount int,
 	nonValidatorOutboundCount int, nonValidatorInboundCount int) {
 
-	userAgentN1 := node1.Params.UserAgent
-	rnManagerN1 := node1.Server.GetConnectionController().GetRemoteNodeManager()
-	n1ValidatedN2 := func() bool {
-		if true != checkRemoteNodeIndexerCount(rnManagerN1, allCount, validatorCount, nonValidatorOutboundCount, nonValidatorInboundCount) {
+	userAgent := node1.Params.UserAgent
+	rnManager := node1.Server.GetConnectionController().GetRemoteNodeManager()
+	condition := func() bool {
+		if true != checkRemoteNodeIndexerCount(rnManager, allCount, validatorCount, nonValidatorOutboundCount, nonValidatorInboundCount) {
 			return false
 		}
 		return true
 	}
-	waitForCondition(t, fmt.Sprintf("Waiting for Node (%s) to have appropriate RemoteNodes counts", userAgentN1), n1ValidatedN2)
+	waitForCondition(t, fmt.Sprintf("Waiting for Node (%s) to have appropriate RemoteNodes counts", userAgent), condition)
 }
 
 func checkRemoteNodeIndexerUserAgent(manager *lib.RemoteNodeManager, userAgent string, validator bool,
@@ -202,5 +223,7 @@ func spawnValidatorNodeProtocol2(t *testing.T, port uint32, id string, blsPriv *
 	node := cmd.NewNode(config)
 	node.Params.UserAgent = id
 	node.Params.ProtocolVersion = lib.ProtocolVersion2
+	node.Params.VersionNegotiationTimeout = 1 * time.Second
+	node.Params.VerackNegotiationTimeout = 1 * time.Second
 	return node
 }
diff --git a/integration_testing/tools.go b/integration_testing/tools.go
@@ -69,7 +69,7 @@ func generateConfig(t *testing.T, port uint32, dataDir string, maxPeers uint32)
 	config.MaxSyncBlockHeight = 0
 	config.ConnectIPs = []string{}
 	config.PrivateMode = true
-	config.GlogV = 0
+	config.GlogV = 2
 	config.GlogVmodule = "*bitcoin_manager*=0,*balance*=0,*view*=0,*frontend*=0,*peer*=0,*addr*=0,*network*=0,*utils*=0,*connection*=0,*main*=0,*server*=0,*mempool*=0,*miner*=0,*blockchain*=0"
 	config.MaxInboundPeers = maxPeers
 	config.TargetOutboundPeers = maxPeers