From 75007dc8a3657c4da16cf6c2b809c846238586b4 Mon Sep 17 00:00:00 2001
From: Richard Holland <richard.holland@starstone.co.nz>
Date: Thu, 5 Jan 2023 13:26:41 +0000
Subject: [PATCH] hook_param_set unit test done

---
 src/ripple/app/hook/impl/applyHook.cpp |  2 +-
 src/test/app/SetHook_test.cpp          | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/ripple/app/hook/impl/applyHook.cpp b/src/ripple/app/hook/impl/applyHook.cpp
index 5def7b823..2ae5979be 100644
--- a/src/ripple/app/hook/impl/applyHook.cpp
+++ b/src/ripple/app/hook/impl/applyHook.cpp
@@ -4999,7 +4999,7 @@ DEFINE_HOOK_FUNCTION(
     if (kread_len > hook::maxHookParameterKeySize())
         return TOO_BIG;
 
-    if (hread_len != hook::maxHookParameterKeySize())
+    if (hread_len != 32)
         return INVALID_ARGUMENT;
 
     if (read_len > hook::maxHookParameterValueSize())
diff --git a/src/test/app/SetHook_test.cpp b/src/test/app/SetHook_test.cpp
index bac4cc3b1..23d24b30d 100644
--- a/src/test/app/SetHook_test.cpp
+++ b/src/test/app/SetHook_test.cpp
@@ -4583,6 +4583,7 @@ public:
             extern int32_t _g       (uint32_t id, uint32_t maxiter);
             extern int64_t accept   (uint32_t read_ptr, uint32_t read_len, int64_t error_code);
             extern int64_t rollback (uint32_t read_ptr, uint32_t read_len, int64_t error_code);
+            extern int64_t hook_param (uint32_t, uint32_t, uint32_t, uint32_t);
             extern int64_t hook_param_set (
                 uint32_t read_ptr,
                 uint32_t read_len,
@@ -4631,7 +4632,7 @@ public:
                 ASSERT(hook_param_set(0, 32, 0, 32, 0, 33) == INVALID_ARGUMENT);
                 ASSERT(hook_param_set(0, 32, 0, 32, 0, 31) == INVALID_ARGUMENT);
                 ASSERT(hook_param_set(0, 32, 0, 32, 0, 0) == INVALID_ARGUMENT);
-                ASSERT(hook_param_set(0, 256, 0, 32, 0, 32) == TOO_BIG);
+                ASSERT(hook_param_set(0, 257, 0, 32, 0, 32) == TOO_BIG);
 
 
                 uint8_t checker_hash[32];
@@ -4646,7 +4647,7 @@ public:
                 ASSERT(hook_param_set(0,0,"checker", 7, SBUF(checker_hash)) == 0);
 
                 // add a parameter that did not previously exist
-                ASSERT(hook_param_set("world", 5,"hello", 5, SBUF(checker_hash)) == 0);
+                ASSERT(hook_param_set("world", 5,"hello", 5, SBUF(checker_hash)) == 5);
 
                 // ensure this hook's parameters did not change
                 uint8_t buf[32];
@@ -4664,7 +4665,7 @@ public:
             
         )[test.hook]"];
 
-        WASM_HEX(checker);
+        HASH_WASM(checker);
 
         Json::Value jv;
         jv[jss::Account] = alice.human();
@@ -4681,8 +4682,8 @@ public:
         Json::Value checkerpv;
         {
             Json::Value piv;
-            piv[jss::HookParameterName] =
-                strHex("checker");
+            piv[jss::HookParameterName] = 
+                strHex(std::string("checker"));
             piv[jss::HookParameterValue] =
                 checker_hash_str;
             checkerpv[jss::HookParameter] = piv;
@@ -4696,7 +4697,7 @@ public:
             piv[jss::HookParameterName] =
                 strHex("param" + std::to_string(i));
             piv[jss::HookParameterValue] =
-                strHex("value0");
+                strHex(std::string("value0"));
             pv[jss::HookParameter] = piv;
             params[i] = pv;
         }
@@ -4711,9 +4712,10 @@ public:
             params[0U] = checkerpv;
             iv[jss::HookParameters] = params;
             jv[jss::Hooks][3U][jss::Hook] = iv;
+            jv[jss::Hooks][1U][jss::Hook] = Json::objectValue;
+            jv[jss::Hooks][2U][jss::Hook] = Json::objectValue;
         }
-    
-
+   
         env(jv,
             M("set hook_param_set"),
             HSFEE,