test: parameterized some nwaku options

This commit is contained in:
Franck Royer 2022-05-26 15:49:39 +10:00 committed by fryorcraken.eth
parent 024209fdd0
commit d65e99275b
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
2 changed files with 8 additions and 6 deletions

View File

@ -10,12 +10,13 @@ describe("nwaku", () => {
const actual = argsToArray(args); const actual = argsToArray(args);
const expected = [ const expected = [
"--nat=none",
"--listen-address=127.0.0.1", "--listen-address=127.0.0.1",
"--nat=none",
"--relay=true", "--relay=true",
"--rpc=true", "--rpc=true",
"--rpc-admin=true", "--rpc-admin=true",
"--websocket-support=true", "--websocket-support=true",
"--log-level=debug",
"--ports-shift=42", "--ports-shift=42",
]; ];

View File

@ -24,6 +24,7 @@ const dbg = debug("waku:nwaku");
const NIM_WAKU_DIR = appRoot + "/nwaku"; const NIM_WAKU_DIR = appRoot + "/nwaku";
const NIM_WAKU_BIN = NIM_WAKU_DIR + "/build/wakunode2"; const NIM_WAKU_BIN = NIM_WAKU_DIR + "/build/wakunode2";
const NODE_READY_LOG_LINE = "Node setup complete";
const LOG_DIR = "./log"; const LOG_DIR = "./log";
@ -135,7 +136,6 @@ export class Nwaku {
tcpPort: ports[1], tcpPort: ports[1],
rpcPort: this.rpcPort, rpcPort: this.rpcPort,
websocketPort: ports[2], websocketPort: ports[2],
logLevel: LogLevel.Trace,
}, },
args args
); );
@ -171,8 +171,8 @@ export class Nwaku {
); );
}); });
dbg("Waiting to see 'Node setup complete' in nwaku logs"); dbg(`Waiting to see '${NODE_READY_LOG_LINE}' in nwaku logs`);
await this.waitForLog("Node setup complete", 15000); await this.waitForLog(NODE_READY_LOG_LINE, 15000);
dbg("nwaku node has been started"); dbg("nwaku node has been started");
} }
@ -366,7 +366,7 @@ export class Nwaku {
}), }),
headers: new Headers({ "Content-Type": "application/json" }), headers: new Headers({ "Content-Type": "application/json" }),
}); });
dbg(`Response received for ${method} call: `, res, "params: ", params);
const json = await res.json(); const json = await res.json();
return json.result; return json.result;
} }
@ -396,12 +396,13 @@ export function argsToArray(args: Args): Array<string> {
export function defaultArgs(): Args { export function defaultArgs(): Args {
return { return {
nat: "none",
listenAddress: "127.0.0.1", listenAddress: "127.0.0.1",
nat: "none",
relay: true, relay: true,
rpc: true, rpc: true,
rpcAdmin: true, rpcAdmin: true,
websocketSupport: true, websocketSupport: true,
logLevel: LogLevel.Debug,
}; };
} }