rpc: rename get_uint64_t to get_uint64

Author: jgriffiths

main/process/get_commitments.c

@@ -51,7 +51,7 @@ void get_commitments_process(void* process_ptr)
         goto cleanup;
     }
 
-    bool ret = rpc_get_uint64_t("value", &params, &ec.c.value);
+    bool ret = rpc_get_uint64("value", &params, &ec.c.value);
     if (!ret) {
         jade_process_reject_message(process, CBOR_RPC_BAD_PARAMETERS, "Failed to extract value from parameters");
         goto cleanup;

main/process/get_otp_code.c

@@ -71,7 +71,7 @@ void get_otp_code_process(void* process_ptr)
     // totp token/code updates with time - but we disable that if an explicit epoch value is passed
     bool auto_update = true;
 #ifdef CONFIG_DEBUG_MODE
-    if (rpc_get_uint64_t("override", &params, &value)) {
+    if (rpc_get_uint64("override", &params, &value)) {
         otp_set_explicit_value(&otp_ctx, value);
         auto_update = false; // frozen on passed override value
     }

main/process/process_utils.c

@@ -84,7 +84,7 @@ int params_set_epoch_time(CborValue* params, const char** errmsg)
     JADE_INIT_OUT_PPTR(errmsg);
 
     uint64_t epoch = 0;
-    if (!rpc_get_uint64_t("epoch", params, &epoch)) {
+    if (!rpc_get_uint64("epoch", params, &epoch)) {
         *errmsg = "Failed to extract valid epoch value from parameters";
         return CBOR_RPC_BAD_PARAMETERS;
     }

main/process/sign_tx.c

@@ -736,7 +736,7 @@ static void sign_tx_impl(jade_process_t* process, const bool for_liquid)
             // Get the amount
             uint64_t satoshi;
             int res = WALLY_EINVAL;
-            if (rpc_get_uint64_t("satoshi", &params, &satoshi)) {
+            if (rpc_get_uint64("satoshi", &params, &satoshi)) {
                 res = wally_map_add_integer(&signing_data->amounts, index, (uint8_t*)&satoshi, sizeof(uint64_t));
                 // Keep a running total
                 input_amount += satoshi;

main/process/sign_utils.c

@@ -140,7 +140,7 @@ static void rpc_get_asset_summary(
 
         if (!cbor_value_is_map(&arrayItem)
             || !rpc_get_n_bytes("asset_id", &arrayItem, sizeof(item->asset_id), item->asset_id)
-            || !rpc_get_uint64_t("satoshi", &arrayItem, &item->value)) {
+            || !rpc_get_uint64("satoshi", &arrayItem, &item->value)) {
             return;
         }
 
@@ -353,7 +353,7 @@ bool params_commitment_data(
 
     if (!(ec.c.content & (COMMITMENTS_VBF | COMMITMENTS_VALUE_BLIND_PROOF))
         || !rpc_get_n_bytes("asset_id", item, sizeof(ec.c.asset_id), ec.c.asset_id)
-        || !rpc_get_uint64_t("value", item, &ec.c.value)) {
+        || !rpc_get_uint64("value", item, &ec.c.value)) {
         *errmsg = "Invalid or missing trusted commitment data";
         return false;
     }

main/utils/cbor_rpc.c

@@ -303,7 +303,7 @@ bool rpc_get_bool_or(const char* field, const CborValue* value, const bool defau
     return res;
 }
 
-bool rpc_get_uint64_t(const char* field, const CborValue* value, uint64_t* res)
+bool rpc_get_uint64(const char* field, const CborValue* value, uint64_t* res)
 {
     JADE_ASSERT(value);
     JADE_ASSERT(res);
@@ -318,10 +318,10 @@ bool rpc_get_uint64_t(const char* field, const CborValue* value, uint64_t* res)
     return true;
 }
 
-uint64_t rpc_get_uint64_t_or(const char* field, const CborValue* value, const uint64_t default_value)
+uint64_t rpc_get_uint64_or(const char* field, const CborValue* value, const uint64_t default_value)
 {
     uint64_t res = default_value;
-    IGNORE_RESULT(rpc_get_uint64_t(field, value, &res));
+    IGNORE_RESULT(rpc_get_uint64(field, value, &res));
     return res;
 }
 

main/utils/cbor_rpc.h

@@ -53,8 +53,8 @@ void rpc_get_bytes(const char* field, size_t max, const CborValue* value, uint8_
 WARN_UNUSED_RESULT bool rpc_get_n_bytes(const char* field, const CborValue* value, size_t expected_size, uint8_t* data);
 WARN_UNUSED_RESULT bool rpc_get_sizet(const char* field, const CborValue* value, size_t* res);
 WARN_UNUSED_RESULT size_t rpc_get_sizet_or(const char* field, const CborValue* value, size_t default_value);
-WARN_UNUSED_RESULT bool rpc_get_uint64_t(const char* field, const CborValue* value, uint64_t* res);
-WARN_UNUSED_RESULT uint64_t rpc_get_uint64_t_or(const char* field, const CborValue* value, uint64_t default_value);
+WARN_UNUSED_RESULT bool rpc_get_uint64(const char* field, const CborValue* value, uint64_t* res);
+WARN_UNUSED_RESULT uint64_t rpc_get_uint64_or(const char* field, const CborValue* value, uint64_t default_value);
 WARN_UNUSED_RESULT bool rpc_get_bool(const char* field, const CborValue* value, bool* res);
 WARN_UNUSED_RESULT bool rpc_get_bool_or(const char* field, const CborValue* value, bool default_value);