Skip to content
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

Bump 0.3 deps #212

Merged
merged 6 commits into from
Jun 13, 2024
Merged

Bump 0.3 deps #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f968694
Bump 0.3 deps
ThetaSinner Jun 11, 2024
1db9c86
Bump versions
ThetaSinner Jun 11, 2024
bbbab3f
Update flake lock
ThetaSinner Jun 12, 2024
09da416
Stick with current tunstenite
ThetaSinner Jun 12, 2024
60945b8
Fix integration with new serialisation
ThetaSinner Jun 13, 2024
9aaeec4
Bump tryorama version too
ThetaSinner Jun 13, 2024
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
514 changes: 352 additions & 162 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ resolver = "2"
futures = "0.3"
hdi = "0.4.1-rc.0"
hdk = "0.3.1-rc.0"
nix = { version = "0.28", features = ["signal"] }
nix = { version = "0.29", features = ["signal"] }
once_cell = "1.5.0"
parking_lot = "0.12"
reqwest = { version = "0.12", default-features = false }
rmp-serde = "=0.15.5"
rmp-serde = "1"
serde = "1.0.181"
serde_bytes = "0.11"
serde_json = "1.0.117"
slab = "0.4"
snafu = "0.6"
structopt = "0.2"
structopt = "0.3"
tokio = "1.38"
tokio-tungstenite = "0.21"
trycp_api = { version = "0.16.0-dev.7", path = "crates/trycp_api" }
trycp_api = { version = "0.16.0-dev.8", path = "crates/trycp_api" }
url = "2"

[profile.dev]
Expand Down
2 changes: 1 addition & 1 deletion crates/trycp_api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trycp_api"
version = "0.16.0-dev.7"
version = "0.16.0-dev.8"
description = "conductor provisioner API for tryorama"
license = "CAL-1.0"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion crates/trycp_client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trycp_client"
version = "0.16.0-dev.7"
version = "0.16.0-dev.8"
description = "Client for TryCP"
license = "CAL-1.0"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion crates/trycp_server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trycp_server"
version = "0.16.0-dev.7"
version = "0.16.0-dev.8"
description = "conductor provisioner for tryorama"
license = "CAL-1.0"
keywords = ["holochain", "holo", "p2p", "network", "simulation"]
Expand Down
50 changes: 25 additions & 25 deletions flake.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 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.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@holochain/tryorama",
"description": "Toolset to manage Holochain conductors and facilitate running test scenarios",
"version": "0.16.0-dev.7",
"version": "0.16.0-dev.8",
"author": "Holochain Foundation",
"license": "MIT",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion ts/src/trycp/trycp-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export class TryCpClient {
"unknown response type",
JSON.stringify(responseWrapper, null, 4)
);
throw new Error("Unknown response type");
throw new Error(`Unknown response type: ${responseWrapper}`);
}
delete tryCpClient.requestPromises[responseWrapper.id];
}
Expand Down
4 changes: 2 additions & 2 deletions ts/src/trycp/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ export type _TryCpResponse = _TryCpResponseSuccess | _TryCpResponseError;
* @internal
*/
export enum _TryCpResponseResult {
Ok = "0",
Err = "1",
Ok = "Ok",
Err = "Err",
}

/**
Expand Down
Loading