From 36d6e667ba7f3b6fcc0cf831fc40b68c9af8dd99 Mon Sep 17 00:00:00 2001
From: Andreas Holstenson <a@holstenson.se>
Date: Thu, 24 Jun 2021 11:08:39 +0200
Subject: [PATCH] fix(core): Do not duplicate peers in TestNetwork

---
 packages/core/src/test/TestNetwork.ts         | 10 +---------
 packages/core/src/test/TestPeer.ts            |  4 ++--
 packages/core/test/topology/TopologyTester.ts |  3 +++
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/core/src/test/TestNetwork.ts b/packages/core/src/test/TestNetwork.ts
index 226b751..b953aba 100644
--- a/packages/core/src/test/TestNetwork.ts
+++ b/packages/core/src/test/TestNetwork.ts
@@ -94,7 +94,7 @@ export class TestNetwork {
 		if(! info) {
 			const [ aPeer, bPeer ] = peersBetween(aInfo.id, bInfo.id);
 			info = {
-				type: ConnectionType.Both,
+				type: ConnectionType.None,
 				aId: a,
 				aPeer: aPeer,
 				aTransport: aInfo.transport,
@@ -135,18 +135,14 @@ export class TestNetwork {
 					// No connection at all, connect both peers
 					info.aPeer.connect();
 					info.bPeer.connect();
-					info.aTransport.addPeer(info.aPeer);
-					info.bTransport.addPeer(info.bPeer);
 					break;
 				case ConnectionType.Forward:
 					// A is connected to B, but B is not connected to A
 					info.bPeer.connect();
-					info.bTransport.addPeer(info.bPeer);
 					break;
 				case ConnectionType.Backward:
 					// B is connected to A, but A is not connected to B
 					info.aPeer.connect();
-					info.aTransport.addPeer(info.aPeer);
 					break;
 			}
 		} else if(type === ConnectionType.None) {
@@ -166,12 +162,10 @@ export class TestNetwork {
 						break;
 					case ConnectionType.None:
 						info.aPeer.connect();
-						info.aTransport.addPeer(info.aPeer);
 						break;
 					case ConnectionType.Backward:
 						info.bPeer.disconnect();
 						info.aPeer.connect();
-						info.aTransport.addPeer(info.aPeer);
 						break;
 				}
 			} else {
@@ -181,12 +175,10 @@ export class TestNetwork {
 						break;
 					case ConnectionType.None:
 						info.bPeer.connect();
-						info.bTransport.addPeer(info.bPeer);
 						break;
 					case ConnectionType.Forward:
 						info.aPeer.disconnect();
 						info.bPeer.connect();
-						info.aTransport.addPeer(info.aPeer);
 						break;
 				}
 			}
diff --git a/packages/core/src/test/TestPeer.ts b/packages/core/src/test/TestPeer.ts
index b57663d..114290c 100644
--- a/packages/core/src/test/TestPeer.ts
+++ b/packages/core/src/test/TestPeer.ts
@@ -93,8 +93,8 @@ export function peersBetween(first: ArrayBuffer, second: ArrayBuffer): [ TestPee
 	a.other = b;
 	b.other = a;
 
-	a.forceConnect(second);
-	b.forceConnect(first);
+	a.id = second;
+	b.id = first;
 
 	return [ a, b ];
 }
diff --git a/packages/core/test/topology/TopologyTester.ts b/packages/core/test/topology/TopologyTester.ts
index ba37ef4..1cfe495 100644
--- a/packages/core/test/topology/TopologyTester.ts
+++ b/packages/core/test/topology/TopologyTester.ts
@@ -93,6 +93,9 @@ export class TopologyTester {
 				bTopology: bInfo.topology
 			};
 
+			aPeer.connect();
+			bPeer.connect();
+
 			info.aTopology.addPeer(info.aPeer);
 			info.bTopology.addPeer(info.bPeer);