chore(core): Remove WithNetwork

aholstenson · Jun 17, 2021 · 9adb458 · 9adb458
1 parent 766b9c0
commit 9adb458
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 30 deletions.
diff --git a/packages/core/src/Network.ts b/packages/core/src/Network.ts
@@ -241,11 +241,7 @@ export class Network<MessageTypes extends object = any> {
 		this.#exchanges = new Exchanges(this);
 
 		// Setup the topology of the network
-		this.#topology = new Topology({
-			networkIdBinary: this.networkIdBinary,
-			networkId: this.networkId,
-			debugNamespace: debugNamespace
-		}, options);
+		this.#topology = new Topology(this, options);
 
 		this.#topology.onAvailable(n => {
 			const node = new NetworkNode(debugNamespace, this.#topology, n.id);

diff --git a/packages/core/src/WithNetwork.ts b/packages/core/src/WithNetwork.ts
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -61,7 +61,5 @@ export * from './MessageData';
 export * from './MessageType';
 export * from './MessageUnion';
 
-export * from './WithNetwork';
-
 export * from './exchange/Exchange';
 export * from './RequestReplyHelper';
diff --git a/packages/core/src/topology/Topology.ts b/packages/core/src/topology/Topology.ts
@@ -14,7 +14,7 @@ import {
 } from 'ataraxia-transport';
 
 import { IdMap, IdSet } from '../id';
-import { WithNetwork } from '../WithNetwork';
+import { Network } from '../Network';
 
 import { Messaging } from './Messaging';
 import { Routing } from './Routing';
@@ -60,7 +60,7 @@ export interface TopologyOptions {
  */
 // TODO: Gossip about updated peer latencies
 export class Topology {
-	private readonly parent: WithNetwork;
+	private readonly parent: Network;
 	private readonly debug: debug.Debugger;
 
 	private readonly endpoint: boolean;
@@ -91,7 +91,7 @@ export class Topology {
 	 * @param options -
 	 *   options to apply
 	 */
-	public constructor(parent: WithNetwork, options: TopologyOptions) {
+	public constructor(parent: Network, options: TopologyOptions) {
 		this.parent = parent;
 		this.endpoint = options.endpoint || false;
 		this.broadcastTimeout = null;
@@ -103,7 +103,7 @@ export class Topology {
 		this.unavailableEvent = new Event(this);
 		this.dataEvent = new Event(this);
 
-		this.debug = debug(parent.debugNamespace + ':topology');
+		this.debug = debug('ataraxia:' + parent.networkName + ':topology');
 
 		this.self = new TopologyNode(this, parent.networkIdBinary);
 		this.self.direct = true;