fix: context create

calimero-network · Dec 6, 2024 · 3c18039 · 3c18039
1 parent 6a69271
commit 3c18039
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/contracts/icp/context-config/src/query.rs b/contracts/icp/context-config/src/query.rs
@@ -33,7 +33,7 @@ fn application_revision(context_id: ICRepr<ContextId>) -> u64 {
 }
 
 #[ic_cdk::query]
-fn proxy_contract(context_id: ICRepr<ContextId>) -> Principal {
+fn proxy_contract(context_id: ICRepr<ContextId>) -> String {
     with_state(|configs| {
         let context = configs
             .contexts
@@ -42,6 +42,7 @@ fn proxy_contract(context_id: ICRepr<ContextId>) -> Principal {
 
         context.proxy.clone()
     })
+    .to_string()
 }
 
 #[ic_cdk::query]

diff --git a/crates/context/config/src/client/env/config/mutate.rs b/crates/context/config/src/client/env/config/mutate.rs
@@ -146,11 +146,15 @@ impl<'a> Method<Icp> for Mutate<'a> {
     }
 
     fn decode(response: Vec<u8>) -> eyre::Result<Self::Returns> {
-        if !response.is_empty() {
-            eyre::bail!("unexpected response {:?}", response);
+        match candid::decode_one::<Result<(), String>>(&response) {
+            Ok(decoded) => match decoded {
+                Ok(()) => Ok(()),
+                Err(err_msg) => eyre::bail!("unexpected response {:?}", err_msg),
+            },
+            Err(e) => {
+                eyre::bail!("unexpected response {:?}", e)
+            }
         }
-
-        Ok(())
     }
 }
 

diff --git a/crates/context/config/src/icp/types.rs b/crates/context/config/src/icp/types.rs
@@ -1,5 +1,6 @@
 use std::borrow::Cow;
 use std::marker::PhantomData;
+use std::time::{SystemTime, UNIX_EPOCH};
 
 use candid::CandidType;
 use ed25519_dalek::{Verifier, VerifyingKey};
@@ -167,7 +168,10 @@ impl ICRequest {
         Self {
             signer_id: ICRepr::new(signer_id),
             kind,
-            timestamp_ms: 0, // Default timestamp for tests
+            timestamp_ms: SystemTime::now()
+                .duration_since(UNIX_EPOCH)
+                .expect("Time went backwards")
+                .as_millis() as u64,
         }
     }
 }