Merge branch 'master' into miraclx/sync-temp

calimero-network · Nov 15, 2024 · e7c027c · e7c027c
2 parents 11af296 + cc64770
commit e7c027c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/context/Cargo.toml b/crates/context/Cargo.toml
@@ -7,7 +7,6 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
-bs58.workspace = true
 camino = { workspace = true, features = ["serde1"] }
 eyre.workspace = true
 futures-util.workspace = true

diff --git a/crates/context/src/lib.rs b/crates/context/src/lib.rs
@@ -580,7 +580,7 @@ impl ContextManager {
             |meta| {
                 let context = Context::new(
                     context_id,
-                    meta.application.application_id(),
+                    application_id.unwrap_or_else(|| meta.application.application_id()),
                     meta.root_hash.into(),
                 );