bugfix: fix integ tests

Author: densumesh

crates/node/src/start_node.rs

@@ -142,7 +142,7 @@ pub async fn start_node(
         .parse()
         .unwrap();
 
-    let mut oracle: Box<dyn Oracle> = if use_mock_oracle.unwrap_or(false) {
+    let oracle: Box<dyn Oracle> = if use_mock_oracle.unwrap_or(false) {
         Box::new(MockOracle::new(
             swarm.network_events.clone(),
             Some(deposit_intent_tx.clone()),
@@ -208,6 +208,11 @@ pub async fn start_node(
         consensus_interface.start().await;
     });
 
+    let mut oracle_clone = oracle.clone();
+    let deposit_monitor_handle = tokio::spawn(async move {
+        oracle_clone.poll_new_transactions(vec![]).await;
+    });
+
     let mut node_state = NodeState::new_from_config(
         &network_handle,
         config,
@@ -261,10 +266,6 @@ pub async fn start_node(
 
     let main_loop_handle = tokio::spawn(async move { node_state.start().await });
 
-    let deposit_monitor_handle = tokio::spawn(async move {
-        oracle.poll_new_transactions(vec![]).await;
-    });
-
     // Create shutdown signal handler for Docker compatibility
     let shutdown_signal = async {
         #[cfg(unix)]

crates/oracle/src/mock.rs

@@ -142,7 +142,7 @@ impl Oracle for MockOracle {
 
     async fn poll_new_transactions(&mut self, _addresses: Vec<Address>) {
         info!("Polling new transactions");
-        let Some(dep_tx_sender) = self.deposit_intent_rx.take() else {
+        let Some(ref dep_tx_sender) = self.deposit_intent_rx else {
             return;
         };
 

crates/protocol/src/transaction.rs

@@ -31,8 +31,8 @@ impl<C> Decode<C> for Transaction {
         let version = u32::decode(d)?;
         let r#type = TransactionType::decode(d)?;
         let operations = Vec::<Operation>::decode(d)?;
-        let metadata = Option::<String>::decode(d)?;
-        let metadata = metadata.map(|s| serde_json::from_str(&s).unwrap());
+        let metadata = String::decode(d)?;
+        let metadata = serde_json::from_str(&metadata).unwrap();
         Ok(Self {
             version,
             r#type,