fmt

base_layer/core/src/mempool/mempool_storage.rs

@@ -112,6 +112,10 @@ impl MempoolStorage {
                 warn!(target: LOG_TARGET, "Validation failed due to consensus rule: {}", msg);
                 Ok(TxStorageResponse::NotStoredConsensus)
             },
+            Err(ValidationError::DuplicateKernelError(msg)) => {
+                warn!(target: LOG_TARGET, "Validation failed due to duplicate kernel: {}", msg);
+                Ok(TxStorageResponse::NotStoredConsensus)
+            },
             Err(e) => {
                 warn!(target: LOG_TARGET, "Validation failed due to error: {}", e);
                 Ok(TxStorageResponse::NotStored)

base_layer/core/tests/mempool.rs

@@ -1188,6 +1188,7 @@ async fn consensus_validation_unique_excess_sig() {
     // trying to submit a transaction with an existing excess signature already in the chain is an error
     let tx = Arc::new(tx1);
     let response = mempool.insert(tx).await.unwrap();
+    dbg!(&response);
     assert!(matches!(response, TxStorageResponse::NotStoredConsensus));
 }
 

base_layer/wallet/src/output_manager_service/storage/sqlite_db/mod.rs

@@ -22,7 +22,7 @@
 
 use std::{
     convert::{TryFrom, TryInto},
-    sync::{Arc, RwLock, Mutex},
+    sync::{Arc, Mutex, RwLock},
 };
 
 use chacha20poly1305::XChaCha20Poly1305;
@@ -663,10 +663,12 @@ impl OutputManagerBackend for OutputManagerSqliteDatabase {
         let start = Instant::now();
         let conn = self.database_connection.get_pooled_connection()?;
         let acquire_lock = start.elapsed();
-        // We need to ensure that this whole encumber operation happens inside of a mutex to ensure thread safety as the transaction first check checks if it can encumber then encumbers them.
-        let _guard = self.encumber_lock.lock().map_err(|e| OutputManagerStorageError::UnexpectedResult(format!(
-            "Encumber lock poisoned: {}", e
-        )))?;
+        // We need to ensure that this whole encumber operation happens inside of a mutex to ensure thread safety as the
+        // transaction first check checks if it can encumber then encumbers them.
+        let _guard = self
+            .encumber_lock
+            .lock()
+            .map_err(|e| OutputManagerStorageError::UnexpectedResult(format!("Encumber lock poisoned: {}", e)))?;
 
         let mut outputs_to_be_spent = Vec::with_capacity(outputs_to_send.len());
 
@@ -721,10 +723,12 @@ impl OutputManagerBackend for OutputManagerSqliteDatabase {
         let conn = self.database_connection.get_pooled_connection()?;
         let acquire_lock = start.elapsed();
 
-        // We need to ensure that this whole encumber operation happens inside of a mutex to ensure thread safety as the transaction first check checks if it can encumber then encumbers them.
-        let _guard = self.encumber_lock.lock().map_err(|e| OutputManagerStorageError::UnexpectedResult(format!(
-            "Encumber lock poisoned: {}", e
-        )))?;
+        // We need to ensure that this whole encumber operation happens inside of a mutex to ensure thread safety as the
+        // transaction first check checks if it can encumber then encumbers them.
+        let _guard = self
+            .encumber_lock
+            .lock()
+            .map_err(|e| OutputManagerStorageError::UnexpectedResult(format!("Encumber lock poisoned: {}", e)))?;
         let outputs_to_be_received =
             OutputSql::find_by_tx_id_and_status(tx_id, OutputStatus::ShortTermEncumberedToBeReceived, &conn)?;
         for o in &outputs_to_be_received {