minor tweaks

xxchan · Apr 29, 2023 · f2f55e8 · f2f55e8
1 parent 7924834
commit f2f55e8
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 433 deletions.
diff --git a/crates/fluvio-smartengine/src/engine/common/transforms/aggregate.rs b/crates/fluvio-smartengine/src/engine/common/transforms/aggregate.rs
@@ -13,18 +13,7 @@ mod test {
 
     const SM_AGGEGRATE: &str = "fluvio_smartmodule_aggregate";
 
-    cfg_if::cfg_if! {
-
-        if #[cfg(feature = "wasmtime-engine")] {
-            type AggregateTransform =
-                crate::engine::common::AggregateTransform<crate::engine::wasmtime::instance::WasmtimeFn>;
-        } else if #[cfg(feature = "wasmedge-engine")] {
-            type AggregateTransform =
-                crate::engine::common::AggregateTransform<crate::engine::wasmedge::instance::WasmEdgeFn>;
-        } else {
-            compile_error!("no engine specified");
-        }
-    }
+    type AggregateTransform = crate::engine::common::AggregateTransform<crate::engine::WasmFnImp>;
 
     #[ignore]
     #[test]

diff --git a/crates/fluvio-smartengine/src/engine/common/transforms/filter.rs b/crates/fluvio-smartengine/src/engine/common/transforms/filter.rs
@@ -13,7 +13,7 @@ mod test {
     const SM_FILTER: &str = "fluvio_smartmodule_filter";
     const SM_FILTER_INIT: &str = "fluvio_smartmodule_filter_init";
 
-    // #[ignore]
+    #[ignore]
     #[test]
     fn test_filter() {
         let engine = SmartEngine::new();

diff --git a/crates/fluvio-smartengine/src/engine/mod.rs b/crates/fluvio-smartengine/src/engine/mod.rs
@@ -100,9 +100,13 @@ cfg_if::cfg_if! {
     if #[cfg(feature = "wasmtime-engine")] {
         pub(crate) mod wasmtime;
         use self::wasmtime::{SmartEngineImp, initialize_imp, SmartModuleChainInstanceImp};
+        #[cfg(test)]
+        use self::wasmtime::WasmFnImp;
     } else if #[cfg(feature = "wasmedge-engine")] {
         pub(crate) mod wasmedge;
         use self::wasmedge::{SmartEngineImp, initialize_imp, SmartModuleChainInstanceImp};
+        #[cfg(test)]
+        use self::wasmedge::WasmFnImp;
     } else {
         compile_error!("no engine specified");
     }

diff --git a/crates/fluvio-smartengine/src/engine/wasmedge/mod.rs b/crates/fluvio-smartengine/src/engine/wasmedge/mod.rs
@@ -2,5 +2,7 @@
 mod imp;
 pub use imp::{SmartEngineImp, initialize_imp, SmartModuleChainInstanceImp};
 /// Implementations of the traits in `common` for the WasmEdge engine
-pub(crate) mod instance;
+mod instance;
+#[cfg(test)]
+pub use instance::WasmEdgeFn as WasmFnImp;
 mod memory;
diff --git a/crates/fluvio-smartengine/src/engine/wasmtime/mod.rs b/crates/fluvio-smartengine/src/engine/wasmtime/mod.rs
@@ -2,6 +2,8 @@
 mod imp;
 pub use imp::{SmartEngineImp, initialize_imp, SmartModuleChainInstanceImp};
 /// Implementations of the traits in `common` for the Wasmtime engine
-pub(crate) mod instance;
+mod instance;
+#[cfg(test)]
+pub use instance::WasmtimeFn as WasmFnImp;
 mod memory;
 mod state;
diff --git a/crates/fluvio-smartengine/src/engine/wasmtime/transforms/aggregate.rs b/crates/fluvio-smartengine/src/engine/wasmtime/transforms/aggregate.rs
diff --git a/crates/fluvio-smartengine/src/engine/wasmtime/transforms/array_map.rs b/crates/fluvio-smartengine/src/engine/wasmtime/transforms/array_map.rs
diff --git a/crates/fluvio-smartengine/src/engine/wasmtime/transforms/filter.rs b/crates/fluvio-smartengine/src/engine/wasmtime/transforms/filter.rs