fix: rebase

waku-org · Jun 20, 2024 · d7583ff · d7583ff
1 parent 59b9f51
commit d7583ff
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/packages/interfaces/src/index.ts b/packages/interfaces/src/index.ts
@@ -6,6 +6,7 @@ export * from "./peer_exchange.js";
 export * from "./protocols.js";
 export * from "./relay.js";
 export * as store_v2 from "./store/v2.js";
+export * from "./store/v3.js";
 export * from "./waku.js";
 export * from "./connection_manager.js";
 export * from "./sender.js";

diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
@@ -14,7 +14,7 @@ export * from "./waku.js";
 export { createLightNode } from "./light-node/index.js";
 export { wakuLightPush } from "./protocols/light_push.js";
 export { wakuFilter } from "./protocols/filter.js";
-export { wakuStore as wakuStoreV2 } from "./protocols/store/v2.js";
+export { wakuStore as wakuStoreV2 } from "./protocols/store/v3.js";
 export { wakuStore } from "./protocols/store/v3.js";
 
 export * as waku from "@waku/core";

diff --git a/packages/sdk/src/protocols/store/v3.ts b/packages/sdk/src/protocols/store/v3.ts
@@ -1,4 +1,4 @@
-import { StoreCore } from "@waku/core";
+import { ConnectionManager, StoreCore } from "@waku/core";
 import {
   IDecodedMessage,
   IDecoder,
@@ -24,9 +24,15 @@ const log = new Logger("waku:store:sdk");
 export class StoreSDK extends BaseProtocolSDK implements IStoreSDK {
   public readonly protocol: StoreCore;
 
-  constructor(libp2p: Libp2p, options?: ProtocolCreateOptions) {
-    super({ numPeersToUse: DEFAULT_NUM_PEERS });
-    this.protocol = new StoreCore(libp2p, options);
+  constructor(
+    connectionManager: ConnectionManager,
+    libp2p: Libp2p,
+    options?: ProtocolCreateOptions
+  ) {
+    super(new StoreCore(libp2p, options), connectionManager, {
+      numPeersToUse: DEFAULT_NUM_PEERS
+    });
+    this.protocol = this.core as StoreCore;
   }
 
   /**
@@ -55,7 +61,7 @@ export class StoreSDK extends BaseProtocolSDK implements IStoreSDK {
 
     const peer = (
       await this.protocol.getPeers({
-        numPeers: this.numPeers,
+        numPeers: this.numPeersToUse,
         maxBootstrapPeers: 1
       })
     )[0];
@@ -232,9 +238,10 @@ export class StoreSDK extends BaseProtocolSDK implements IStoreSDK {
  * @returns A function that takes a Libp2p instance and returns a StoreSDK instance.
  */
 export function wakuStore(
+  connectionManager: ConnectionManager,
   init: Partial<ProtocolCreateOptions> = {}
 ): (libp2p: Libp2p) => IStoreSDK {
   return (libp2p: Libp2p) => {
-    return new StoreSDK(libp2p, init);
+    return new StoreSDK(connectionManager, libp2p, init);
   };
 }
diff --git a/packages/sdk/src/waku.ts b/packages/sdk/src/waku.ts
@@ -21,7 +21,7 @@ import { Logger } from "@waku/utils";
 
 import { wakuFilter } from "./protocols/filter.js";
 import { wakuLightPush } from "./protocols/light_push.js";
-import { wakuStore } from "./protocols/store.js";
+import { wakuStore } from "./protocols/store/v3.js";
 import { subscribeToContentTopic } from "./utils/content_topic.js";
 
 export const DefaultPingKeepAliveValueSecs = 5 * 60;