Skip to content

fix: update tests and fix running on main-0.6 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zippy wants to merge 1 commit into
base: main-0.6
Choose a base branch
from
Open

fix: update tests and fix running on main-0.6 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Run tests
on:
pull_request:
push:
branches: [main]
branches: [main, main-0.6]

concurrency:
group: ${{ github.ref_name }}
Expand Down
92 changes: 38 additions & 54 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ members = [
resolver = "2"

[workspace.dependencies]
hdi = "0.7.0-dev.13"
hdk = "0.6.0-dev.15"
hdi = "0.7.1-rc.1"
hdk = "0.6.1-rc.1"
holochain_serialized_bytes = "0.0.56"
serde = "1.0.192"

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion ts/src/conductor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,10 @@ export class Conductor {
});
}

setNetworkConfig(createConductorOptions: NetworkConfig, signalingServerUrl?: URL) {
setNetworkConfig(
createConductorOptions: NetworkConfig,
signalingServerUrl?: URL,
) {
const conductorConfig = readFileSync(
`${this.conductorDir}/${CONDUCTOR_CONFIG}`,
"utf-8",
Expand Down
2 changes: 1 addition & 1 deletion ts/test/conductor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ test("Conductor with custom bootstrap server", async () => {
});

test("Conductor with custom signaling server", async () => {
const signalingServerUrl = new URL("ws://some-signal.server:1234");
const signalingServerUrl = new URL("http://some-signal.server:1234");
const conductor = await createConductor(signalingServerUrl, {
startup: false,
});
Expand Down
27 changes: 12 additions & 15 deletions ts/test/scenario.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ test("Set custom network config", async () => {
const minInitiateIntervalMs = 20_000;
const initiateJitterMs = 5_000;
const roundTimeoutMs = 20_000;
const transportTimeoutS = 1_000;
const targetArcFactor = 0;

const alice = await scenario.addPlayerWithApp({
Expand All @@ -134,7 +133,6 @@ test("Set custom network config", async () => {
minInitiateIntervalMs,
initiateJitterMs,
roundTimeoutMs,
transportTimeoutS,
targetArcFactor,
},
},
Expand All @@ -158,15 +156,15 @@ test("Set custom network config", async () => {
assert.strictEqual(network.target_arc_factor, targetArcFactor);

assert.ok(
advanced && typeof advanced === "object" && "tx5Transport" in advanced,
advanced && typeof advanced === "object" && "irohTransport" in advanced,
);
const { tx5Transport } = advanced;
const { irohTransport } = advanced;
assert.ok(
tx5Transport &&
typeof tx5Transport === "object" &&
"timeoutS" in tx5Transport,
irohTransport &&
typeof irohTransport === "object" &&
"relayAllowPlainText" in irohTransport,
);
assert.strictEqual(tx5Transport.timeoutS, transportTimeoutS);
assert.strictEqual(irohTransport.relayAllowPlainText, true);

assert.ok(advanced && typeof advanced === "object" && "k2Gossip" in advanced);
const { k2Gossip } = advanced;
Expand All @@ -192,7 +190,6 @@ test("Default network config", async () => {
const minInitiateIntervalMs = 3_000;
const initiateJitterMs = 1_000;
const roundTimeoutMs = 5_000;
const transportTimeoutS = 15;
const targetArcFactor = 1;

const alice = await scenario.addPlayerWithApp({
Expand Down Expand Up @@ -220,15 +217,15 @@ test("Default network config", async () => {
assert.strictEqual(network.target_arc_factor, targetArcFactor);

assert.ok(
advanced && typeof advanced === "object" && "tx5Transport" in advanced,
advanced && typeof advanced === "object" && "irohTransport" in advanced,
);
const { tx5Transport } = advanced;
const { irohTransport } = advanced;
assert.ok(
tx5Transport &&
typeof tx5Transport === "object" &&
"timeoutS" in tx5Transport,
irohTransport &&
typeof irohTransport === "object" &&
"relayAllowPlainText" in irohTransport,
);
assert.strictEqual(tx5Transport.timeoutS, transportTimeoutS);
assert.strictEqual(irohTransport.relayAllowPlainText, true);

assert.ok(advanced && typeof advanced === "object" && "k2Gossip" in advanced);
const { k2Gossip } = advanced;
Expand Down
Loading