Update to use new struct and field nmames

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>

Author: emersonknapp

rcl/include/rcl/type_version_hash.h

@@ -23,6 +23,7 @@ extern "C"
 #include "rcl/types.h"
 #include "rcl/visibility_control.h"
 #include "rcutils/sha256.h"
+#include "rosidl_runtime_c/type_hash.h"
 #include "type_description_interfaces/msg/type_description.h"
 
 /// Given a TypeDescription, output a string of the hashable JSON representation of that data.
@@ -66,7 +67,7 @@ RCL_PUBLIC
 rcl_ret_t
 rcl_calculate_type_version_hash(
   const type_description_interfaces__msg__TypeDescription * type_description,
-  uint8_t output_hash[RCUTILS_SHA256_BLOCK_SIZE]);
+  rosidl_type_hash_t * out_type_hash);
 
 #ifdef __cplusplus
 }

rcl/src/rcl/type_version_hash.c

@@ -239,7 +239,7 @@ rcl_type_description_to_hashable_json(
 rcl_ret_t
 rcl_calculate_type_version_hash(
   const type_description_interfaces__msg__TypeDescription * type_description,
-  uint8_t output_hash[RCUTILS_SHA256_BLOCK_SIZE])
+  rosidl_type_hash_t * output_hash)
 {
   RCL_CHECK_ARGUMENT_FOR_NULL(type_description, RCL_RET_INVALID_ARGUMENT);
   RCL_CHECK_ARGUMENT_FOR_NULL(output_hash, RCL_RET_INVALID_ARGUMENT);
@@ -248,13 +248,14 @@ rcl_calculate_type_version_hash(
   rcutils_char_array_t msg_repr = rcutils_get_zero_initialized_char_array();
   msg_repr.allocator = rcl_get_default_allocator();
 
+  output_hash->version = 1;
   result = rcl_type_description_to_hashable_json(type_description, &msg_repr);
   if (result == RCL_RET_OK) {
     rcutils_sha256_ctx_t sha_ctx;
     rcutils_sha256_init(&sha_ctx);
     // Last item in char_array is null terminator, which should not be hashed.
     rcutils_sha256_update(&sha_ctx, (const uint8_t *)msg_repr.buffer, msg_repr.buffer_length - 1);
-    rcutils_sha256_final(&sha_ctx, output_hash);
+    rcutils_sha256_final(&sha_ctx, output_hash->value);
   }
   result = rcutils_char_array_fini(&msg_repr);
   return result;

rcl/test/rcl/test_type_version_hash.cpp

@@ -65,8 +65,7 @@ TEST(TestTypeVersionHash, smoke_check) {
   );
 
   rosidl_type_hash_t direct_hash;
-  direct_hash.version = 1;
-  res = rcl_calculate_type_version_hash(td_msg, direct_hash.value);
+  res = rcl_calculate_type_version_hash(td_msg, &direct_hash);
   ASSERT_EQ(res, RCL_RET_OK);
 
   rosidl_type_hash_t hash_from_repr;
@@ -185,7 +184,7 @@ TEST(TestTypeVersionHash, nested_types) {
   );
 
   rosidl_type_hash_t direct_hash;
-  res = rcl_calculate_type_version_hash(td_msg, direct_hash.value);
+  res = rcl_calculate_type_version_hash(td_msg, &direct_hash);
   ASSERT_EQ(res, RCL_RET_OK);
 
   rosidl_type_hash_t hash_from_repr;