From fff6e5f1f6fc7cb947fb2689cbe06a5f9f8e89e4 Mon Sep 17 00:00:00 2001 From: PhilippGackstatter Date: Mon, 14 Mar 2022 17:55:40 +0100 Subject: [PATCH 1/3] Update iota.rs, disable unused `identity-comm` --- Cargo.toml | 2 +- identity-comm/Cargo.toml | 2 +- identity-iota/Cargo.toml | 4 ++-- identity/Cargo.toml | 4 ++-- identity/src/lib.rs | 22 +++++++++++----------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1564d0b248..5543e55d1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ resolver = "2" members = [ "identity", - "identity-comm", + # "identity-comm", "identity-account", "identity-account-storage", "identity-core", diff --git a/identity-comm/Cargo.toml b/identity-comm/Cargo.toml index 202a705008..0d9974cbe2 100644 --- a/identity-comm/Cargo.toml +++ b/identity-comm/Cargo.toml @@ -15,7 +15,7 @@ identity-core = { path = "../identity-core", version = "=0.5.0-dev.4" } identity-credential = { path = "../identity-credential", version = "=0.5.0-dev.4" } identity-did = { path = "../identity-did", version = "=0.5.0-dev.4" } identity-iota = { path = "../identity-iota", version = "=0.5.0-dev.4", default-features = false } -libjose = { path = "../libjose", version = "=0.1.0" } +# libjose = { path = "../libjose", version = "=0.1.0" } paste = { version = "1.0" } serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } diff --git a/identity-iota/Cargo.toml b/identity-iota/Cargo.toml index 2a501f7707..0b2dcc1892 100644 --- a/identity-iota/Cargo.toml +++ b/identity-iota/Cargo.toml @@ -32,13 +32,13 @@ thiserror = { version = "1.0", default-features = false } [dependencies.iota-client] git = "https://github.com/iotaledger/iota.rs" -rev = "7f5ae8f5b27f5948d8e1b4717419cc1321d862da" +rev = "2b3c768c441754627996b2ce391e8266d43635dc" features = ["tls"] default-features = false [target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies.iota-client] git = "https://github.com/iotaledger/iota.rs" -rev = "7f5ae8f5b27f5948d8e1b4717419cc1321d862da" +rev = "2b3c768c441754627996b2ce391e8266d43635dc" default-features = false features = ["wasm"] diff --git a/identity/Cargo.toml b/identity/Cargo.toml index 82abd3d83d..b820f6ae44 100644 --- a/identity/Cargo.toml +++ b/identity/Cargo.toml @@ -14,7 +14,7 @@ description = "Tools for working with Self-sovereign Identity." [dependencies] identity-account = { version = "=0.5.0-dev.4", path = "../identity-account", default-features = false, optional = true } identity-account-storage = { version = "=0.5.0-dev.4", path = "../identity-account-storage", default-features = false, optional = true } -identity-comm = { version = "=0.5.0-dev.4", path = "../identity-comm", optional = true } +# identity-comm = { version = "=0.5.0-dev.4", path = "../identity-comm", optional = true } identity-core = { version = "=0.5.0-dev.4", path = "../identity-core", default-features = false } identity-credential = { version = "=0.5.0-dev.4", path = "../identity-credential" } identity-did = { version = "=0.5.0-dev.4", path = "../identity-did" } @@ -42,7 +42,7 @@ account = ["identity-account", "identity-account-storage"] stronghold = ["identity-account/stronghold", "identity-account-storage/stronghold"] # Enables support for DID Communication -comm = ["identity-comm"] +# comm = ["identity-comm"] [package.metadata.docs.rs] # To build locally: diff --git a/identity/src/lib.rs b/identity/src/lib.rs index 4731b9df17..6f5202f124 100644 --- a/identity/src/lib.rs +++ b/identity/src/lib.rs @@ -116,17 +116,17 @@ pub mod account_storage { pub use identity_account_storage::utils::*; } -#[cfg(feature = "comm")] -#[cfg_attr(docsrs, doc(cfg(feature = "comm")))] -pub mod comm { - //! DID Communications Message Specification - //! - //! [Specification](https://github.com/iotaledger/identity.rs/tree/dev/docs/DID%20Communications%20Research%20and%20Specification) - - pub use identity_comm::envelope::*; - pub use identity_comm::error::*; - pub use identity_comm::message::*; -} +// #[cfg(feature = "comm")] +// #[cfg_attr(docsrs, doc(cfg(feature = "comm")))] +// pub mod comm { +// //! DID Communications Message Specification +// //! +// //! [Specification](https://github.com/iotaledger/identity.rs/tree/dev/docs/DID%20Communications%20Research%20and%20Specification) + +// pub use identity_comm::envelope::*; +// pub use identity_comm::error::*; +// pub use identity_comm::message::*; +// } pub mod prelude { //! Prelude of commonly used types From 301daa07559eecb2e7d2cc40aa284bdc8ce0f3a3 Mon Sep 17 00:00:00 2001 From: PhilippGackstatter Date: Tue, 15 Mar 2022 10:44:54 +0100 Subject: [PATCH 2/3] Fix typo in `Cargo.toml` --- identity-iota/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/identity-iota/Cargo.toml b/identity-iota/Cargo.toml index 0b2dcc1892..8036e0252c 100644 --- a/identity-iota/Cargo.toml +++ b/identity-iota/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["iota", "tangle", "identity"] license = "Apache-2.0" readme = "../README.md" repository = "https://github.com/iotaledger/identity.rs" -description = "An IOTA Tangle intergration for the identity-rs library." +description = "An IOTA Tangle integration for the identity.rs library." [dependencies] async-trait = { version = "0.1", default-features = false } From eaf18cf5cf1177eed9e2e89d7378c179adcc29c0 Mon Sep 17 00:00:00 2001 From: PhilippGackstatter Date: Tue, 15 Mar 2022 13:51:15 +0100 Subject: [PATCH 3/3] Update iota.rs that includes wasm `instant` fix --- identity-iota/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/identity-iota/Cargo.toml b/identity-iota/Cargo.toml index 8036e0252c..69153e2591 100644 --- a/identity-iota/Cargo.toml +++ b/identity-iota/Cargo.toml @@ -32,13 +32,13 @@ thiserror = { version = "1.0", default-features = false } [dependencies.iota-client] git = "https://github.com/iotaledger/iota.rs" -rev = "2b3c768c441754627996b2ce391e8266d43635dc" +rev = "7d7ae32da03d3375318c181c2428a36de530d1a3" features = ["tls"] default-features = false [target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies.iota-client] git = "https://github.com/iotaledger/iota.rs" -rev = "2b3c768c441754627996b2ce391e8266d43635dc" +rev = "7d7ae32da03d3375318c181c2428a36de530d1a3" default-features = false features = ["wasm"]