Skip to content

chore: bump candid to 0.6.0 #28

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

Merged
hansl merged 1 commit into from
Sep 8, 2020
Merged

chore: bump candid to 0.6.0 #28

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 ic-agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ async-trait = "0.1.35"
base32 = "0.4.0"
base64 = "0.12.3"
byteorder = "1.3.2"
candid = "0.5.4"
candid = "0.6.0"
delay = "0.2.0"
hex = "0.4.0"
ic-types = { path = "../ic-types", version = "0.1", features = [ "serde" ] }
Expand Down
22 changes: 11 additions & 11 deletions ic-agent/src/canister/management_canister.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ impl<'agent> ManagementCanister<'agent> {
canister_id: &Principal,
) -> Result<CanisterStatus, AgentError> {
let canister_to_install = CanisterRecord {
canister_id: Principal::from_text(canister_id.to_text())?,
canister_id: canister_id.to_owned(),
};
let bytes: Vec<u8> = candid::Encode!(&canister_to_install).unwrap();
let bytes: Vec<u8> = candid::Encode!(&canister_to_install)?;
let bytes_to_decode = self
.agent
.update(&Principal::management_canister(), STATUS_METHOD_NAME)
Expand All @@ -101,7 +101,7 @@ impl<'agent> ManagementCanister<'agent> {
waiter: W,
) -> Result<Principal, AgentError> {
// candid encoding of () i.e. no arguments
let bytes: Vec<u8> = candid::Encode!().unwrap();
let bytes: Vec<u8> = candid::Encode!()?;
let bytes_to_decode = self
.agent
.update(&Principal::management_canister(), CREATE_METHOD_NAME)
Expand All @@ -119,9 +119,9 @@ impl<'agent> ManagementCanister<'agent> {
canister_id: &Principal,
) -> Result<(), AgentError> {
let canister_to_install = CanisterRecord {
canister_id: Principal::from_text(canister_id.to_text())?,
canister_id: canister_id.to_owned(),
};
let bytes: Vec<u8> = candid::Encode!(&canister_to_install).unwrap();
let bytes: Vec<u8> = candid::Encode!(&canister_to_install)?;
let bytes_to_decode = self
.agent
.update(&Principal::management_canister(), DELETE_METHOD_NAME)
Expand All @@ -139,9 +139,9 @@ impl<'agent> ManagementCanister<'agent> {
canister_id: &Principal,
) -> Result<(), AgentError> {
let canister_to_install = CanisterRecord {
canister_id: Principal::from_text(canister_id.to_text())?,
canister_id: canister_id.to_owned(),
};
let bytes: Vec<u8> = candid::Encode!(&canister_to_install).unwrap();
let bytes: Vec<u8> = candid::Encode!(&canister_to_install)?;
let bytes_to_decode = self
.agent
.update(&Principal::management_canister(), START_METHOD_NAME)
Expand All @@ -159,9 +159,9 @@ impl<'agent> ManagementCanister<'agent> {
canister_id: &Principal,
) -> Result<(), AgentError> {
let canister_to_install = CanisterRecord {
canister_id: Principal::from_text(canister_id.to_text())?,
canister_id: canister_id.to_owned(),
};
let bytes: Vec<u8> = candid::Encode!(&canister_to_install).unwrap();
let bytes: Vec<u8> = candid::Encode!(&canister_to_install)?;
let bytes_to_decode = self
.agent
.update(&Principal::management_canister(), STOP_METHOD_NAME)
Expand All @@ -184,12 +184,12 @@ impl<'agent> ManagementCanister<'agent> {
) -> Result<(), AgentError> {
let canister_to_install = CanisterInstall {
mode,
canister_id: Principal::from_text(canister_id.to_text())?,
canister_id: canister_id.to_owned(),
wasm_module: module.to_vec(),
arg: arg.to_vec(),
compute_allocation: attributes.compute_allocation.map(|x| x.into()),
};
let bytes: Vec<u8> = candid::Encode!(&canister_to_install).unwrap();
let bytes: Vec<u8> = candid::Encode!(&canister_to_install)?;
let bytes_to_decode = self
.agent
.update(&Principal::management_canister(), INSTALL_METHOD_NAME)
Expand Down
4 changes: 2 additions & 2 deletions ic-agent/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
//!
//! #[derive(CandidType, Deserialize)]
//! struct CreateCanisterResult {
//! canister_id: candid::Principal,
//! canister_id: Principal,
//! }
//!
//! # fn create_identity() -> impl ic_agent::Identity {
Expand Down Expand Up @@ -55,7 +55,7 @@
//! .await?;
//!
//! let result = Decode!(response.as_slice(), CreateCanisterResult)?;
//! let canister_id: Principal = Principal::from_text(&result.canister_id.to_text())?;
//! let canister_id: Principal = result.canister_id;
//! Ok(canister_id)
//! }
//!
Expand Down
2 changes: 1 addition & 1 deletion icx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
candid = "0.5.4"
candid = "0.6.0"
clap = "3.0.0-beta.1"
delay = "0.2.0"
hex = "0.4.2"
Expand Down