refactor: clean

apps/blockchain/src/lib.rs

@@ -82,7 +82,7 @@ impl AppState {
 
     pub fn approve_proposal(&mut self, proposal_id: env::ext::ProposalId) -> Result<bool, Error> {
         println!("Approve proposal: {:?}", proposal_id);
-        let _ = Self::external().approve().approve(proposal_id);
+        let _ = Self::external().approve(proposal_id);
         Ok(true)
     }
 

crates/node/src/lib.rs

@@ -8,7 +8,7 @@ use core::future::{pending, Future};
 use core::pin::Pin;
 use std::time::Duration;
 
-use borsh::{from_slice, to_vec, BorshDeserialize};
+use borsh::{from_slice, to_vec};
 use calimero_blobstore::config::BlobStoreConfig;
 use calimero_blobstore::{BlobManager, FileSystem};
 use calimero_context::config::ContextConfig;
@@ -36,7 +36,6 @@ use camino::Utf8PathBuf;
 use eyre::{bail, eyre, Result as EyreResult};
 use libp2p::gossipsub::{IdentTopic, Message, TopicHash};
 use libp2p::identity::Keypair;
-use libp2p::relay::client::new;
 use rand::{thread_rng, Rng};
 use tokio::io::{stdin, AsyncBufReadExt, BufReader};
 use tokio::select;

crates/sdk/src/env/ext.rs

@@ -114,13 +114,6 @@ impl DraftProposal {
 
         ProposalId(buf)
     }
-
-    /// Finalise the proposal and send it to the blockchain.
-    #[must_use]
-    pub fn approve(self, proposal_id: ProposalId) -> ProposalId {
-        unsafe { sys::approve_proposal(BufferMut::new(&proposal_id)) }
-        proposal_id
-    }
 }
 
 /// Interface for interacting with external proposals for blockchain actions.
@@ -134,8 +127,8 @@ impl External {
         DraftProposal::new()
     }
 
-    pub const fn approve(self) -> DraftProposal {
-        DraftProposal::new()
+    pub fn approve(self, proposal_id: ProposalId) {
+        unsafe { sys::approve_proposal(BufferMut::new(&proposal_id)) }
     }
 }
 

crates/sdk/src/sys.rs

@@ -65,5 +65,3 @@ macro_rules! wasm_imports {
 }
 
 use wasm_imports;
-
-use crate::env::ext::ProposalId;