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

Fix dependent diff updates being rejected #605

Merged
merged 8 commits into from
Jan 24, 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
4 changes: 2 additions & 2 deletions bindings/wasm/examples/src/diff_chain.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 IOTA Stiftung
// Copyright 2020-2022 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

import {Client, Config, Document, Service, Timestamp} from '@iota/identity-wasm';
Expand Down Expand Up @@ -31,7 +31,7 @@ async function createDiff(clientConfig) {
let serviceJSON = {
id: doc.id + "#linked-domain-1",
type: "LinkedDomains",
serviceEndpoint: "https://identity.iota.org",
serviceEndpoint: "https://example.com/",
};
updatedDoc.insertService(Service.fromJSON(serviceJSON));
updatedDoc.metadataUpdated = Timestamp.nowUTC();
Expand Down
2 changes: 1 addition & 1 deletion examples/low-level-api/diff_chain.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 IOTA Stiftung
// Copyright 2020-2022 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

//! An example that demonstrates how to publish changes to the integration chain to update a
Expand Down
2 changes: 1 addition & 1 deletion identity-did/src/diff/diff_document.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 IOTA Stiftung
// Copyright 2020-2022 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

use serde::Deserialize;
Expand Down
2 changes: 1 addition & 1 deletion identity-did/src/diff/diff_method.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 IOTA Stiftung
// Copyright 2020-2022 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

use identity_core::common::Object;
Expand Down
1 change: 1 addition & 0 deletions identity-diff/derive/src/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ impl InputModel {
}
}

#[allow(clippy::wrong_self_convention)]
pub fn from_into(&self) -> bool {
match self {
Self::Struct(InputStruct { from_into, .. }) => *from_into,
Expand Down
2 changes: 1 addition & 1 deletion identity-diff/src/object.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2021 IOTA Stiftung
// Copyright 2020-2022 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

use serde_json::Value;
Expand Down
3 changes: 3 additions & 0 deletions identity-iota/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ version = "0.7"
default-features = false
features = ["blake2b"]

[dev-dependencies]
tokio = { version = "1.15", default-features = false, features = ["macros"] }

[features]
default = ["async"]

Expand Down
Loading