cleaner code

src/publications/publication.ts

@@ -435,7 +435,7 @@ class Publication extends TypedEmitter<PublicationEvents> {
             .map(([provider]) => provider);
         providers.forEach((provider) => this._clientsManager.updatePubsubState("waiting-challenge-verification", provider));
 
-        log(`Responded to challenge (${this._challengeAnswer.challengeRequestId}) with answers`, challengeAnswers);
+        log(`Responded to challenge  with answers`, challengeAnswers);
         this.emit("challengeanswer", this._challengeAnswer);
     }
 

src/rpc/src/index.ts

@@ -141,6 +141,8 @@ class PlebbitWsServer extends EventEmitter {
             this.subscriptionCleanups[ws._id] = {};
             //@ts-expect-error
             this._onSettingsChange[ws._id] = {};
+            //@ts-expect-error
+            log("Established connection with new RPC client", ws._id);
         });
 
         // cleanup on disconnect
@@ -153,6 +155,7 @@ class PlebbitWsServer extends EventEmitter {
             delete this.subscriptionCleanups[ws._id];
             delete this.connections[ws._id];
             delete this._onSettingsChange[ws._id];
+            log("Disconnected from RPC client", ws._id);
         });
 
         // register all JSON RPC methods

src/runtime/node/subplebbit/local-subplebbit.ts

@@ -786,8 +786,8 @@ export class LocalSubplebbit extends RpcLocalSubplebbit implements CreateNewLoca
         this._clientsManager.updatePubsubState("publishing-challenge", undefined);
 
         await this._clientsManager.pubsubPublish(this.pubsubTopicWithfallback(), challengeMessage);
-        log.trace(
-            `Published ${challengeMessage.type} over pubsub: `,
+        log(
+            `Subplebbit ${this.address} published ${challengeMessage.type} over pubsub: `,
             remeda.pick(toSignChallenge, ["timestamp"]),
             toEncryptChallenge.challenges.map((challenge) => challenge.type)
         );

src/test/mock-ipfs-client.ts

@@ -1,5 +1,5 @@
 import io, { Socket } from "socket.io-client";
-import { IpfsClient, PubsubSubscriptionHandler } from "../types.js";
+import type { IpfsClient, PubsubSubscriptionHandler } from "../types.js";
 
 const port = 25963;
 

src/test/test-util.ts

@@ -150,10 +150,7 @@ export async function loadAllPages(pageCid: string, pagesInstance: BasePages) {
 }
 
 async function _mockSubplebbitPlebbit(signers: SignerType[], plebbitOptions: InputPlebbitOptions) {
-    const plebbit = await mockPlebbit({ ...plebbitOptions, pubsubHttpClientsOptions: ["http://localhost:15002/api/v0"] });
-
-    for (const pubsubUrl of remeda.keys.strict(plebbit.clients.pubsubClients))
-        plebbit.clients.pubsubClients[pubsubUrl]._client = createMockIpfsClient();
+    const plebbit = await mockPlebbit({ ...plebbitOptions, pubsubHttpClientsOptions: ["http://localhost:15002/api/v0"] }, true);
 
     return plebbit;
 }
@@ -404,7 +401,7 @@ export async function createOnlinePlebbit(plebbitOptions?: InputPlebbitOptions)
 }
 
 export async function mockRemotePlebbitIpfsOnly(plebbitOptions?: InputPlebbitOptions) {
-    const plebbit = await mockRemotePlebbit({
+    const plebbit = await mockPlebbit({
         ipfsHttpClientsOptions: ["http://localhost:15001/api/v0"],
         plebbitRpcClientsOptions: undefined,
         dataPath: undefined,
@@ -512,6 +509,13 @@ export async function publishWithExpectedResult(publication: Publication, expect
         });
     });
 
+    publication.once("challenge", (challenge) =>
+        console.log(
+            "Received challenges in publishWithExpectedResult. Are you sure you're publishing to a sub with no challenges?",
+            challenge
+        )
+    );
+
     await publication.publish();
     await validateResponsePromise;
 }