Cleanup ports from CoreNode

zkSNACKs · Jul 21, 2019 · 13f5416 · 13f5416
1 parent 811ab4d
commit 13f5416
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 40 deletions.
diff --git a/WalletWasabi.Tests/NodeBuilding/CoreNode.cs b/WalletWasabi.Tests/NodeBuilding/CoreNode.cs
@@ -19,7 +19,11 @@ public class CoreNode
 		private NodeBuilder Builder { get; }
 		public string Folder { get; }
 
-		public EndPoint Endpoint => new IPEndPoint(IPAddress.Loopback, Ports[0]);
+		public int P2pPort { get; }
+		public int RpcPort { get; }
+
+		public EndPoint P2pEndPoint { get; }
+		public EndPoint RpcEndPoint { get; }
 
 		public string Config { get; }
 
@@ -36,8 +40,35 @@ private CoreNode(string folder, NodeBuilder builder)
 			Creds = new NetworkCredential(pass, pass);
 			Config = Path.Combine(DataDir, "bitcoin.conf");
 			ConfigParameters.Import(builder.ConfigParameters);
-			Ports = new int[2];
-			FindPorts(Ports);
+
+			var portArray = new int[2];
+			var i = 0;
+			while (i < portArray.Length)
+			{
+				var port = RandomUtils.GetUInt32() % 4000;
+				port += 10000;
+				if (portArray.Any(p => p == port))
+				{
+					continue;
+				}
+
+				try
+				{
+					var listener = new TcpListener(IPAddress.Loopback, (int)port);
+					listener.Start();
+					listener.Stop();
+					portArray[i] = (int)port;
+					i++;
+				}
+				catch (SocketException)
+				{
+				}
+			}
+
+			P2pPort = portArray[0];
+			RpcPort = portArray[1];
+			P2pEndPoint = new IPEndPoint(IPAddress.Loopback, P2pPort);
+			RpcEndPoint = new IPEndPoint(IPAddress.Loopback, RpcPort);
 		}
 
 		public Block[] Generate(int blockCount)
@@ -60,23 +91,21 @@ public static async Task<CoreNode> CreateAsync(string folder, NodeBuilder builde
 
 		public CoreNodeState State { get; private set; }
 
-		private int[] Ports { get; }
-
 		internal readonly NetworkCredential Creds;
 
 		public RPCClient CreateRpcClient()
 		{
-			return new RPCClient(Creds, new Uri("http://127.0.0.1:" + Ports[1] + "/"), Network.RegTest);
+			return new RPCClient($"{Creds.UserName}:{Creds.Password}", RpcEndPoint.ToString(RpcPort), Network.RegTest);
 		}
 
 		public async Task<Node> CreateNodeClientAsync()
 		{
-			return await Node.ConnectAsync(Network.RegTest, new IPEndPoint(IPAddress.Loopback, Ports[0]));
+			return await Node.ConnectAsync(Network.RegTest, P2pEndPoint);
 		}
 
 		public async Task<Node> CreateNodeClientAsync(NodeConnectionParameters parameters)
 		{
-			return await Node.ConnectAsync(Network.RegTest, new IPEndPoint(IPAddress.Loopback, Ports[0]), parameters);
+			return await Node.ConnectAsync(Network.RegTest, P2pEndPoint, parameters);
 		}
 
 		public async Task StartAsync()
@@ -90,8 +119,8 @@ public async Task StartAsync()
 				{"regtest.txindex", "1"},
 				{"regtest.rpcuser", Creds.UserName},
 				{"regtest.rpcpassword", Creds.Password},
-				{"regtest.whitebind", "127.0.0.1:" + Ports[0].ToString()},
-				{"regtest.rpcport", Ports[1].ToString()},
+				{"regtest.whitebind", "127.0.0.1:" + P2pPort.ToString()},
+				{"regtest.rpcport", RpcPort.ToString()},
 				{"regtest.printtoconsole", "0"}, // Set it to one if do not mind loud debug logs
 				{"regtest.keypool", "10"},
 				{"regtest.pid", "bitcoind.pid"}
@@ -130,32 +159,6 @@ public async Task StartAsync()
 		private Process Process { get; set; }
 		private string DataDir { get; }
 
-		private static void FindPorts(int[] portArray)
-		{
-			var i = 0;
-			while (i < portArray.Length)
-			{
-				var port = RandomUtils.GetUInt32() % 4000;
-				port += 10000;
-				if (portArray.Any(p => p == port))
-				{
-					continue;
-				}
-
-				try
-				{
-					var listener = new TcpListener(IPAddress.Loopback, (int)port);
-					listener.Start();
-					listener.Stop();
-					portArray[i] = (int)port;
-					i++;
-				}
-				catch (SocketException)
-				{
-				}
-			}
-		}
-
 		private readonly AsyncLock KillerLock = new AsyncLock();
 
 		public async Task TryKillAsync(bool cleanFolder = true)

diff --git a/WalletWasabi.Tests/RegTests.cs b/WalletWasabi.Tests/RegTests.cs
@@ -83,7 +83,7 @@ private async Task<(string password, RPCClient rpc, Network network, CcjCoordina
 			global.Coordinator.UtxoReferee.Clear();
 
 			var network = global.RpcClient.Network;
-			var serviceConfiguration = new ServiceConfiguration(2, 2, 21, 50, RegTestFixture.BackendRegTestNode.Endpoint, Money.Coins(0.0001m));
+			var serviceConfiguration = new ServiceConfiguration(2, 2, 21, 50, RegTestFixture.BackendRegTestNode.P2pEndPoint, Money.Coins(0.0001m));
 			var bitcoinStore = new BitcoinStore();
 			var dir = Path.Combine(Global.Instance.DataDir, caller);
 			await bitcoinStore.InitializeAsync(dir, network);

diff --git a/WalletWasabi.Tests/XunitConfiguration/RegTestFixture.cs b/WalletWasabi.Tests/XunitConfiguration/RegTestFixture.cs
@@ -32,7 +32,6 @@ public RegTestFixture()
 			BackendNodeBuilder.StartAllAsync().GetAwaiter().GetResult();
 			BackendRegTestNode = BackendNodeBuilder.Nodes[0];
 
-			var rpc = BackendRegTestNode.CreateRpcClient();
 			var connectionString = $"{BackendRegTestNode.Creds.UserName}:{BackendRegTestNode.Creds.Password}";
 
 			var testnetBackendDir = EnvironmentHelpers.GetDataDir(Path.Combine("WalletWasabi", "Tests", "Backend"));
@@ -44,10 +43,10 @@ public RegTestFixture()
 				BackendNodeBuilder.Network, connectionString,
 				new IPEndPoint(IPAddress.Loopback, Network.Main.DefaultPort),
 				new IPEndPoint(IPAddress.Loopback, Network.TestNet.DefaultPort),
-				BackendRegTestNode.Endpoint,
+				BackendRegTestNode.P2pEndPoint,
 				new IPEndPoint(IPAddress.Loopback, Network.Main.RPCPort),
 				new IPEndPoint(IPAddress.Loopback, Network.TestNet.RPCPort),
-				EndPointParser.TryParse(rpc.Address.DnsSafeHost, rpc.Address.Port, out EndPoint rep) ? rep : throw new NotSupportedException());
+				BackendRegTestNode.RpcEndPoint);
 			var configFilePath = Path.Combine(testnetBackendDir, "Config.json");
 			config.SetFilePath(configFilePath);
 			config.ToFileAsync().GetAwaiter().GetResult();