diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dacb476..df6303ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,15 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## \[Unreleased\] ### Added -- New parameter can be specified when calling `addPlayerWithApp` to specify the logLevel that the Holochain conductor - should be launched with. ### Removed ### Changed ### Fixed +## 2024-08-13: v0.17.0-dev.5 +### Added +- New parameter can be specified when calling `addPlayerWithApp` to specify the logLevel that the Holochain conductor + should be launched with. + ## 2024-07-23: v0.17.0-dev.4 ### Changed - Update default signal server to wss://sbd-0.main.infra.holo.host. diff --git a/Cargo.lock b/Cargo.lock index 180e3db0..c929f3f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3160,7 +3160,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trycp_api" -version = "0.17.0-dev.2" +version = "0.17.0-dev.5" dependencies = [ "serde", "serde_bytes", @@ -3169,7 +3169,7 @@ dependencies = [ [[package]] name = "trycp_client" -version = "0.17.0-dev.2" +version = "0.17.0-dev.5" dependencies = [ "futures", "rmp-serde", @@ -3181,7 +3181,7 @@ dependencies = [ [[package]] name = "trycp_server" -version = "0.17.0-dev.2" +version = "0.17.0-dev.5" dependencies = [ "futures", "nix", diff --git a/Cargo.toml b/Cargo.toml index 6bc4ce7f..7ddc3d65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ snafu = "0.6" structopt = "0.2" tokio = "1.38" tokio-tungstenite = "0.21" -trycp_api = { version = "0.17.0-dev.2", path = "crates/trycp_api" } +trycp_api = { version = "0.17.0-dev.5", path = "crates/trycp_api" } url = "2" [profile.dev] diff --git a/crates/trycp_api/Cargo.toml b/crates/trycp_api/Cargo.toml index d3c9712b..ed45d0aa 100644 --- a/crates/trycp_api/Cargo.toml +++ b/crates/trycp_api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trycp_api" -version = "0.17.0-dev.2" +version = "0.17.0-dev.5" description = "conductor provisioner API for tryorama" license = "CAL-1.0" edition = "2021" diff --git a/crates/trycp_client/Cargo.toml b/crates/trycp_client/Cargo.toml index 7743662a..64bfb12f 100644 --- a/crates/trycp_client/Cargo.toml +++ b/crates/trycp_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trycp_client" -version = "0.17.0-dev.2" +version = "0.17.0-dev.5" description = "Client for TryCP" license = "CAL-1.0" edition = "2021" diff --git a/crates/trycp_server/Cargo.toml b/crates/trycp_server/Cargo.toml index fc5a0a23..21183db0 100644 --- a/crates/trycp_server/Cargo.toml +++ b/crates/trycp_server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trycp_server" -version = "0.17.0-dev.2" +version = "0.17.0-dev.5" description = "conductor provisioner for tryorama" license = "CAL-1.0" keywords = ["holochain", "holo", "p2p", "network", "simulation"] diff --git a/docs/tryorama.trycpclient.addconductor.md b/docs/tryorama.trycpclient.addconductor.md index 3e980176..dc0c6a49 100644 --- a/docs/tryorama.trycpclient.addconductor.md +++ b/docs/tryorama.trycpclient.addconductor.md @@ -9,7 +9,7 @@ Create and add a conductor to the client. **Signature:** ```typescript -addConductor(partialConfig?: string): Promise; +addConductor(options?: TryCpConductorOptions): Promise; ``` ## Parameters @@ -32,17 +32,17 @@ Description -partialConfig +options -string +[TryCpConductorOptions](./tryorama.trycpconductoroptions.md) -_(Optional)_ Conductor configuration (optional). +_(Optional)_ Conductor configuration, log level and other settings (optional). diff --git a/docs/tryorama.trycpclient.md b/docs/tryorama.trycpclient.md index 3a6eac05..0c8e456e 100644 --- a/docs/tryorama.trycpclient.md +++ b/docs/tryorama.trycpclient.md @@ -110,7 +110,7 @@ Description -[addConductor(partialConfig)](./tryorama.trycpclient.addconductor.md) +[addConductor(options)](./tryorama.trycpclient.addconductor.md) diff --git a/docs/tryorama.trycpconductoroptions.loglevel.md b/docs/tryorama.trycpconductoroptions.loglevel.md index ca8e8f7e..37dfd018 100644 --- a/docs/tryorama.trycpconductoroptions.loglevel.md +++ b/docs/tryorama.trycpconductoroptions.loglevel.md @@ -6,7 +6,7 @@ Log level of the conductor (optional). -default: "info" +default: "error" **Signature:** diff --git a/docs/tryorama.trycpconductoroptions.md b/docs/tryorama.trycpconductoroptions.md index 7983e6ef..a4e3e7dd 100644 --- a/docs/tryorama.trycpconductoroptions.md +++ b/docs/tryorama.trycpconductoroptions.md @@ -70,7 +70,7 @@ _(Optional)_ Identifier for the conductor (optional). _(Optional)_ Log level of the conductor (optional). -default: "info" +default: "error" diff --git a/docs/tryorama.trycpscenario.addplayerwithapp.md b/docs/tryorama.trycpscenario.addplayerwithapp.md index 2ed3b6b7..8746f661 100644 --- a/docs/tryorama.trycpscenario.addplayerwithapp.md +++ b/docs/tryorama.trycpscenario.addplayerwithapp.md @@ -9,7 +9,9 @@ Creates and adds a single player with an installed app to the scenario, **Signature:** ```typescript -addPlayerWithApp(tryCpClient: TryCpClient, appBundleSource: AppBundleSource, options?: AppOptions): Promise; +addPlayerWithApp(tryCpClient: TryCpClient, appBundleSource: AppBundleSource, options?: AppOptions & { + logLevel?: TryCpConductorLogLevel; + }): Promise; ``` ## Parameters @@ -69,7 +71,7 @@ options -[AppOptions](./tryorama.appoptions.md) +[AppOptions](./tryorama.appoptions.md) & { logLevel?: [TryCpConductorLogLevel](./tryorama.trycpconductorloglevel.md); } diff --git a/package.json b/package.json index 3ca44b62..222b0dc6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@holochain/tryorama", "description": "Toolset to manage Holochain conductors and facilitate running test scenarios", - "version": "0.17.0-dev.4", + "version": "0.17.0-dev.5", "author": "Holochain Foundation", "license": "MIT", "keywords": [ diff --git a/ts/src/trycp/conductor/scenario.ts b/ts/src/trycp/conductor/scenario.ts index 4028f7fc..ce2c09de 100644 --- a/ts/src/trycp/conductor/scenario.ts +++ b/ts/src/trycp/conductor/scenario.ts @@ -138,7 +138,7 @@ export class TryCpScenario { // create conductors for each client for (let i = 0; i < numberOfConductorsPerClient; i++) { const conductorCreated = client - .addConductor(options?.partialConfig) + .addConductor({partialConfig: options?.partialConfig}) .then(async (conductor) => { const app = options.app; let appOptions;