Refine RedisCacheDatabase scaffolding in Rust

nautechsystems · Nov 26, 2023 · 9952e3a · 9952e3a
1 parent c125557
commit 9952e3a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/nautilus_core/infrastructure/src/cache.rs b/nautilus_core/infrastructure/src/cache.rs
@@ -36,7 +36,7 @@ pub trait CacheDatabase {
 
     fn new(trader_id: TraderId, config: HashMap<String, Value>) -> Result<Self::DatabaseType>;
     fn read(&mut self, op_type: String) -> Result<Vec<Vec<u8>>>;
-    fn write(&mut self, op_type: String, payload: Vec<Vec<u8>>) -> Result<String>;
+    fn write(&mut self, op_type: String, payload: Vec<Vec<u8>>) -> Result<(), String>;
     fn handle_ops(
         trader_id: TraderId,
         config: HashMap<String, Value>,

diff --git a/nautilus_core/infrastructure/src/python/cache.rs b/nautilus_core/infrastructure/src/python/cache.rs
@@ -48,15 +48,15 @@ impl RedisCacheDatabase {
     #[pyo3(name = "read")]
     fn py_read(&mut self, op_type: String) -> PyResult<Vec<Vec<u8>>> {
         match self.read(op_type) {
-            Ok(result) => Ok(result),
+            Ok(payload) => Ok(payload),
             Err(e) => Err(to_pyruntime_err(e)),
         }
     }
 
     #[pyo3(name = "write")]
-    fn py_write(&mut self, op_type: String, payload: Vec<Vec<u8>>) -> PyResult<String> {
+    fn py_write(&mut self, op_type: String, payload: Vec<Vec<u8>>) -> PyResult<()> {
         match self.write(op_type, payload) {
-            Ok(ok) => Ok(ok),
+            Ok(_) => Ok(()),
             Err(e) => Err(to_pyvalue_err(e)),
         }
     }

diff --git a/nautilus_core/infrastructure/src/redis.rs b/nautilus_core/infrastructure/src/redis.rs
@@ -19,7 +19,7 @@ use std::{
     thread,
 };
 
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use nautilus_common::redis::get_redis_url;
 use nautilus_model::identifiers::trader_id::TraderId;
 use pyo3::prelude::*;
@@ -64,11 +64,11 @@ impl CacheDatabase for RedisCacheDatabase {
         Ok(result)
     }
 
-    fn write(&mut self, op_type: String, payload: Vec<Vec<u8>>) -> Result<String> {
+    fn write(&mut self, op_type: String, payload: Vec<Vec<u8>>) -> Result<(), String> {
         let op = DatabaseOperation::new(op_type, payload);
         match self.tx.send(op) {
-            Ok(_) => Ok("OK".to_string()),
-            Err(e) => Err(anyhow!("Failed to send to channel: {e}")),
+            Ok(_) => Ok(()),
+            Err(e) => Err(format!("Failed to send to channel: {e}").to_string()),
         }
     }