chore: remove network option we don't want to expose

Signed-off-by: Sacha Froment <[email protected]>
topology-foundation · Feb 5, 2025 · 3565b61 · 3565b61
1 parent 044fd7b
commit 3565b61
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 43 deletions.
diff --git a/configs/e2e-bootstrap.json b/configs/e2e-bootstrap.json
@@ -3,11 +3,6 @@
 		"listen_addresses": ["/ip4/0.0.0.0/tcp/50000/ws", "/ip4/0.0.0.0/tcp/50001"],
 		"bootstrap": true,
 		"bootstrap_peers": [],
-		"private_key_seed": "bootstrap",
-		"pubsub": {
-			"peer_discovery_interval": 1000,
-			"prune_backoff": 10,
-			"heartbeat_interval": 10
-		}
+		"private_key_seed": "bootstrap"
 	}
 }
diff --git a/examples/grid/src/index.ts b/examples/grid/src/index.ts
@@ -8,14 +8,8 @@ import { getColorForPeerId } from "./util/color";
 export function getNetworkConfigFromEnv() {
 	const hasBootstrapPeers = Boolean(import.meta.env.VITE_BOOTSTRAP_PEERS);
 	const hasDiscoveryInterval = Boolean(import.meta.env.VITE_DISCOVERY_INTERVAL);
-	const hasPubsubPruneBackoff = Boolean(import.meta.env.VITE_PUBSUB_PRUNE_BACKOFF);
-	const hasPubsubHeartbeatInterval = Boolean(import.meta.env.VITE_PUBSUB_HEARTBEAT_INTERVAL);
 
-	const hasEnv =
-		hasBootstrapPeers ||
-		hasDiscoveryInterval ||
-		hasPubsubPruneBackoff ||
-		hasPubsubHeartbeatInterval;
+	const hasEnv = hasBootstrapPeers || hasDiscoveryInterval;
 
 	const config: Record<string, unknown> = {
 		browser_metrics: true,
@@ -35,20 +29,6 @@ export function getNetworkConfigFromEnv() {
 		};
 	}
 
-	if (hasPubsubPruneBackoff) {
-		config.pubsub = {
-			...(config.pubsub || {}),
-			prune_backoff: import.meta.env.VITE_PUBSUB_PRUNE_BACKOFF,
-		};
-	}
-
-	if (hasPubsubHeartbeatInterval) {
-		config.pubsub = {
-			...(config.pubsub || {}),
-			heartbeat_interval: import.meta.env.VITE_PUBSUB_HEARTBEAT_INTERVAL,
-		};
-	}
-
 	return config;
 }
 

diff --git a/examples/grid/vite-env.d.ts b/examples/grid/vite-env.d.ts
@@ -4,8 +4,6 @@ interface ImportMetaEnv {
 	readonly VITE_BOOTSTRAP_PEERS: string;
 	readonly VITE_DISCOVERY_INTERVAL: number;
 	readonly VITE_RENDER_INFO_INTERVAL: number;
-	readonly VITE_PUBSUB_PRUNE_BACKOFF: number;
-	readonly VITE_PUBSUB_HEARTBEAT_INTERVAL: number;
 }
 
 interface ImportMeta {

diff --git a/packages/network/src/node.ts b/packages/network/src/node.ts
@@ -58,8 +58,6 @@ export interface DRPNetworkNodeConfig {
 	private_key_seed?: string;
 	pubsub?: {
 		peer_discovery_interval?: number;
-		prune_backoff?: number;
-		heartbeat_interval?: number;
 	};
 }
 
@@ -119,12 +117,6 @@ export class DRPNetworkNode {
 			pubsub: gossipsub({
 				doPX: true,
 				allowPublishToZeroTopicPeers: true,
-				...(this._config?.pubsub?.prune_backoff
-					? { pruneBackoff: this._config.pubsub.prune_backoff }
-					: {}),
-				...(this._config?.pubsub?.heartbeat_interval
-					? { heartbeatInterval: this._config.pubsub.heartbeat_interval }
-					: {}),
 				scoreParams: createPeerScoreParams({
 					IPColocationFactorWeight: 0,
 					appSpecificScore: (peerId: string) => {
@@ -156,12 +148,6 @@ export class DRPNetworkNode {
 					doPX: true,
 					ignoreDuplicatePublishError: true,
 					allowPublishToZeroTopicPeers: true,
-					...(this._config?.pubsub?.prune_backoff
-						? { pruneBackoff: this._config.pubsub.prune_backoff }
-						: {}),
-					...(this._config?.pubsub?.heartbeat_interval
-						? { heartbeatInterval: this._config.pubsub.heartbeat_interval }
-						: {}),
 					scoreParams: createPeerScoreParams({
 						topicScoreCap: 50,
 						IPColocationFactorWeight: 0,