Simplify the info handler example

RedisLabsModules · Jul 18, 2023 · be7fc5f · be7fc5f
1 parent 87a128e
commit be7fc5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 40 deletions.
diff --git a/examples/info_handler_macro.rs b/examples/info_handler_macro.rs
@@ -1,39 +1,10 @@
 use std::collections::HashMap;
 
 use redis_module::InfoContext;
-use redis_module::{redis_module, Context, RedisError, RedisResult, RedisString};
+use redis_module::{redis_module, RedisResult};
 use redis_module_macros::info_command_handler;
 use redis_module_macros::InfoSection;
 
-fn test_helper_version(ctx: &Context, _args: Vec<RedisString>) -> RedisResult {
-    let ver = ctx.get_redis_version()?;
-    let response: Vec<i64> = vec![ver.major.into(), ver.minor.into(), ver.patch.into()];
-
-    Ok(response.into())
-}
-
-fn test_helper_version_rm_call(ctx: &Context, _args: Vec<RedisString>) -> RedisResult {
-    let ver = ctx.get_redis_version_rm_call()?;
-    let response: Vec<i64> = vec![ver.major.into(), ver.minor.into(), ver.patch.into()];
-
-    Ok(response.into())
-}
-
-fn test_helper_command_name(ctx: &Context, _args: Vec<RedisString>) -> RedisResult {
-    Ok(ctx.current_command_name()?.into())
-}
-
-fn test_helper_err(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
-    if args.len() < 1 {
-        return Err(RedisError::WrongArity);
-    }
-
-    let msg = args.get(1).unwrap();
-
-    ctx.reply_error_string(msg.try_as_str().unwrap());
-    Ok(().into())
-}
-
 #[derive(Debug, Clone, InfoSection)]
 struct InfoData {
     field: String,
@@ -54,14 +25,9 @@ fn add_info(ctx: &InfoContext, _for_crash_report: bool) -> RedisResult<()> {
 //////////////////////////////////////////////////////
 
 redis_module! {
-    name: "test_helper",
+    name: "info_handler_macro",
     version: 1,
     allocator: (redis_module::alloc::RedisAlloc, redis_module::alloc::RedisAlloc),
     data_types: [],
-    commands: [
-        ["test_helper.version", test_helper_version, "", 0, 0, 0],
-        ["test_helper._version_rm_call", test_helper_version_rm_call, "", 0, 0, 0],
-        ["test_helper.name", test_helper_command_name, "", 0, 0, 0],
-        ["test_helper.err", test_helper_err, "", 0, 0, 0],
-    ],
+    commands: [],
 }
diff --git a/tests/integration.rs b/tests/integration.rs
@@ -123,10 +123,10 @@ fn test_helper_info() -> Result<()> {
             get_redis_connection(port).with_context(|| "failed to connect to redis server")?;
 
         let res: String = redis::cmd("INFO")
-            .arg("TEST_HELPER")
+            .arg(module)
             .query(&mut con)
-            .with_context(|| "failed to run INFO TEST_HELPER")?;
-        assert!(res.contains("test_helper_field:test_helper_value"));
+            .with_context(|| format!("failed to run INFO {module}"))?;
+        assert!(res.contains(&format!("{module}_field:test_helper_value")));
         assert!(res.contains("dictionary:key=value"));
 
         Ok(())