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.

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

Update iota.rs to include timeout bugfix #712

Merged
merged 3 commits into from
Mar 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
resolver = "2"
members = [
"identity",
"identity-comm",
# "identity-comm",
"identity-account",
"identity-account-storage",
"identity-core",
Expand Down
2 changes: 1 addition & 1 deletion identity-comm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
6 changes: 3 additions & 3 deletions identity-iota/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -32,13 +32,13 @@ thiserror = { version = "1.0", default-features = false }

[dependencies.iota-client]
git = "https://github.com/iotaledger/iota.rs"
rev = "7f5ae8f5b27f5948d8e1b4717419cc1321d862da"
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 = "7f5ae8f5b27f5948d8e1b4717419cc1321d862da"
rev = "7d7ae32da03d3375318c181c2428a36de530d1a3"
default-features = false
features = ["wasm"]

Expand Down
4 changes: 2 additions & 2 deletions identity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down Expand Up @@ -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:
Expand Down
22 changes: 11 additions & 11 deletions identity/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down