Skip to content

Commit

Permalink
fix: merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
peterwht committed Dec 16, 2024
1 parent 86b5a61 commit 0ac034d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@ walkdir = "2.5"
indexmap = "2.2"
toml_edit = { version = "0.22", features = ["serde"] }
symlink = "0.1"
scale-info = { version = "2.11.3", default-features = false, features = [
"derive",
] }
scale-value = { version = "0.16.2", default-features = false, features = [
"from-string",
"parser-ss58",
] }
serde_json = { version = "1.0", features = ["preserve_order"] }
serde = { version = "1.0", features = ["derive"] }
zombienet-sdk = "0.2.18"
Expand Down
2 changes: 1 addition & 1 deletion crates/pop-cli/src/wallet_integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ mod tests {
.await
.expect("Failed to parse response");

assert_eq!(response, json!({"status": "success"}));
assert_eq!(response, json!({"status": "success"}).to_string());
assert_eq!(wim.state.lock().await.signed_payload, Some("0xDEADBEEF".to_string()));
assert_eq!(wim.is_running(), false);

Expand Down

0 comments on commit 0ac034d

Please sign in to comment.