Merge branch 'main' into 00773-tck-c++-implement-json-rpc-methods-for…

…-tokenupdatetransaction Signed-off-by: Rob Walworth <[email protected]>
hiero-ledger · Nov 25, 2024 · 69d3554 · 69d3554
2 parents 8c0d77b + b9e2bdc
commit 69d3554
Show file tree

Hide file tree

Showing 23 changed files with 433 additions and 339 deletions.
diff --git a/src/sdk/examples/ContractHelper.h b/src/sdk/examples/ContractHelper.h
@@ -185,7 +185,8 @@ class ContractHelper
 
       const ContractFunctionResult result = txRecord.mContractFunctionResult.value();
       const std::function<bool(const ContractFunctionResult&)> validatorFunc =
-        hasResultValidator ? mStepResultValidators.at(step) : [](const ContractFunctionResult& stepResult)
+        hasResultValidator ? mStepResultValidators.at(step)
+                           : [](const ContractFunctionResult& stepResult)
       {
         // Assume no custom validator means the function should return a success.
         const Status status =

diff --git a/src/sdk/main/include/FeeAssessmentMethod.h b/src/sdk/main/include/FeeAssessmentMethod.h
@@ -30,16 +30,16 @@ enum class FeeAssessmentMethod
  * Map of FeeAssessmentMethod to its corresponding string.
  */
 const std::unordered_map<FeeAssessmentMethod, std::string> gFeeAssessmentMethodToString = {
-  { FeeAssessmentMethod::INCLUSIVE, "INCLUSIVE" },
-  { FeeAssessmentMethod::EXCLUSIVE, "EXCLUSIVE" }
+  {FeeAssessmentMethod::INCLUSIVE,  "INCLUSIVE"},
+  { FeeAssessmentMethod::EXCLUSIVE, "EXCLUSIVE"}
 };
 
 /**
  * Map of FeeAssessmentMethod string representation to its corresponding enum value.
  */
 [[maybe_unused]] const std::unordered_map<std::string, FeeAssessmentMethod> gStringToFeeAssessmentMethod = {
-  { "INCLUSIVE", FeeAssessmentMethod::INCLUSIVE },
-  { "EXCLUSIVE", FeeAssessmentMethod::EXCLUSIVE }
+  {"INCLUSIVE",  FeeAssessmentMethod::INCLUSIVE},
+  { "EXCLUSIVE", FeeAssessmentMethod::EXCLUSIVE}
 };
 
 } // namespace Hiero

diff --git a/src/sdk/main/include/Transaction.h b/src/sdk/main/include/Transaction.h
@@ -477,9 +477,10 @@ class Transaction
    */
   [[nodiscard]]
   typename Executable<SdkRequestType, proto::Transaction, proto::TransactionResponse, TransactionResponse>::
-    ExecutionStatus determineStatus(Status status,
-                                    const Client& client,
-                                    [[maybe_unused]] const proto::TransactionResponse& response) override;
+    ExecutionStatus
+    determineStatus(Status status,
+                    const Client& client,
+                    [[maybe_unused]] const proto::TransactionResponse& response) override;
 
   /**
    * Derived from Executable. Perform any needed actions for this Transaction when it is being submitted.

diff --git a/src/sdk/main/include/impl/MirrorNodeRouter.h b/src/sdk/main/include/impl/MirrorNodeRouter.h
@@ -56,10 +56,10 @@ class MirrorNodeRouter
    * Internal mapping of mirror node query types to their respective routes.
    */
   const std::unordered_map<std::string, std::string> routes = {
-    { ACCOUNT_INFO_QUERY,        "/api/v1/accounts/$"        },
-    { CONTRACT_INFO_QUERY,       "/api/v1/contracts/$"       },
-    { TOKEN_RELATIONSHIPS_QUERY, "/api/v1/accounts/$/tokens" },
-    { TOKEN_BALANCES_QUERY,      "/api/v1/tokens/$/balances" }
+    {ACCOUNT_INFO_QUERY,         "/api/v1/accounts/$"       },
+    { CONTRACT_INFO_QUERY,       "/api/v1/contracts/$"      },
+    { TOKEN_RELATIONSHIPS_QUERY, "/api/v1/accounts/$/tokens"},
+    { TOKEN_BALANCES_QUERY,      "/api/v1/tokens/$/balances"}
   };
 };
 

diff --git a/src/sdk/main/src/FeeDataType.cc b/src/sdk/main/src/FeeDataType.cc
@@ -7,34 +7,34 @@ namespace Hiero
 {
 //-----
 const std::unordered_map<proto::SubType, FeeDataType> gProtobufSubTypeToFeeDataType = {
-  { proto::SubType::DEFAULT,                                    FeeDataType::DEFAULT                                },
-  { proto::SubType::TOKEN_FUNGIBLE_COMMON,                      FeeDataType::TOKEN_FUNGIBLE_COMMON                  },
-  { proto::SubType::TOKEN_NON_FUNGIBLE_UNIQUE,                  FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE              },
-  { proto::SubType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES,     FeeDataType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES },
+  {proto::SubType::DEFAULT,                                     FeeDataType::DEFAULT                               },
+  { proto::SubType::TOKEN_FUNGIBLE_COMMON,                      FeeDataType::TOKEN_FUNGIBLE_COMMON                 },
+  { proto::SubType::TOKEN_NON_FUNGIBLE_UNIQUE,                  FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE             },
+  { proto::SubType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES,     FeeDataType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES},
   { proto::SubType::TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES,
-   FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES                                                          },
-  { proto::SubType::SCHEDULE_CREATE_CONTRACT_CALL,              FeeDataType::SCHEDULE_CREATE_CONTRACT_CALL          }
+   FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES                                                         },
+  { proto::SubType::SCHEDULE_CREATE_CONTRACT_CALL,              FeeDataType::SCHEDULE_CREATE_CONTRACT_CALL         }
 };
 
 //-----
 const std::unordered_map<FeeDataType, proto::SubType> gFeeDataTypeToProtobufSubType = {
-  { FeeDataType::DEFAULT,                                    proto::SubType::DEFAULT                                },
-  { FeeDataType::TOKEN_FUNGIBLE_COMMON,                      proto::SubType::TOKEN_FUNGIBLE_COMMON                  },
-  { FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE,                  proto::SubType::TOKEN_NON_FUNGIBLE_UNIQUE              },
-  { FeeDataType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES,     proto::SubType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES },
+  {FeeDataType::DEFAULT,                                     proto::SubType::DEFAULT                               },
+  { FeeDataType::TOKEN_FUNGIBLE_COMMON,                      proto::SubType::TOKEN_FUNGIBLE_COMMON                 },
+  { FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE,                  proto::SubType::TOKEN_NON_FUNGIBLE_UNIQUE             },
+  { FeeDataType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES,     proto::SubType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES},
   { FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES,
-   proto::SubType::TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES                                                       },
-  { FeeDataType::SCHEDULE_CREATE_CONTRACT_CALL,              proto::SubType::SCHEDULE_CREATE_CONTRACT_CALL          },
+   proto::SubType::TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES                                                      },
+  { FeeDataType::SCHEDULE_CREATE_CONTRACT_CALL,              proto::SubType::SCHEDULE_CREATE_CONTRACT_CALL         },
 };
 
 //-----
 const std::unordered_map<FeeDataType, std::string> gFeeDataTypeToString = {
-  { FeeDataType::DEFAULT,                                    "DEFAULT"                                    },
-  { FeeDataType::TOKEN_FUNGIBLE_COMMON,                      "TOKEN_FUNGIBLE_COMMON"                      },
-  { FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE,                  "TOKEN_NON_FUNGIBLE_UNIQUE"                  },
-  { FeeDataType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES,     "TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES"     },
-  { FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES, "TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES" },
-  { FeeDataType::SCHEDULE_CREATE_CONTRACT_CALL,              "SCHEDULE_CREATE_CONTRACT_CALL"              },
+  {FeeDataType::DEFAULT,                                     "DEFAULT"                                   },
+  { FeeDataType::TOKEN_FUNGIBLE_COMMON,                      "TOKEN_FUNGIBLE_COMMON"                     },
+  { FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE,                  "TOKEN_NON_FUNGIBLE_UNIQUE"                 },
+  { FeeDataType::TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES,     "TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES"    },
+  { FeeDataType::TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES, "TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES"},
+  { FeeDataType::SCHEDULE_CREATE_CONTRACT_CALL,              "SCHEDULE_CREATE_CONTRACT_CALL"             },
 };
 
 } // namespace Hiero
diff --git a/src/sdk/main/src/FreezeType.cc b/src/sdk/main/src/FreezeType.cc
@@ -7,32 +7,32 @@ namespace Hiero
 {
 //-----
 const std::unordered_map<proto::FreezeType, FreezeType> gProtobufFreezeTypeToFreezeType = {
-  { proto::FreezeType::UNKNOWN_FREEZE_TYPE, FreezeType::UNKNOWN_FREEZE_TYPE },
-  { proto::FreezeType::FREEZE_ONLY,         FreezeType::FREEZE_ONLY         },
-  { proto::FreezeType::PREPARE_UPGRADE,     FreezeType::PREPARE_UPGRADE     },
-  { proto::FreezeType::FREEZE_UPGRADE,      FreezeType::FREEZE_UPGRADE      },
-  { proto::FreezeType::FREEZE_ABORT,        FreezeType::FREEZE_ABORT        },
-  { proto::FreezeType::TELEMETRY_UPGRADE,   FreezeType::TELEMETRY_UPGRADE   },
+  {proto::FreezeType::UNKNOWN_FREEZE_TYPE, FreezeType::UNKNOWN_FREEZE_TYPE},
+  { proto::FreezeType::FREEZE_ONLY,        FreezeType::FREEZE_ONLY        },
+  { proto::FreezeType::PREPARE_UPGRADE,    FreezeType::PREPARE_UPGRADE    },
+  { proto::FreezeType::FREEZE_UPGRADE,     FreezeType::FREEZE_UPGRADE     },
+  { proto::FreezeType::FREEZE_ABORT,       FreezeType::FREEZE_ABORT       },
+  { proto::FreezeType::TELEMETRY_UPGRADE,  FreezeType::TELEMETRY_UPGRADE  },
 };
 
 //-----
 const std::unordered_map<FreezeType, proto::FreezeType> gFreezeTypeToProtobufFreezeType = {
-  { FreezeType::UNKNOWN_FREEZE_TYPE, proto::FreezeType::UNKNOWN_FREEZE_TYPE },
-  { FreezeType::FREEZE_ONLY,         proto::FreezeType::FREEZE_ONLY         },
-  { FreezeType::PREPARE_UPGRADE,     proto::FreezeType::PREPARE_UPGRADE     },
-  { FreezeType::FREEZE_UPGRADE,      proto::FreezeType::FREEZE_UPGRADE      },
-  { FreezeType::FREEZE_ABORT,        proto::FreezeType::FREEZE_ABORT        },
-  { FreezeType::TELEMETRY_UPGRADE,   proto::FreezeType::TELEMETRY_UPGRADE   },
+  {FreezeType::UNKNOWN_FREEZE_TYPE, proto::FreezeType::UNKNOWN_FREEZE_TYPE},
+  { FreezeType::FREEZE_ONLY,        proto::FreezeType::FREEZE_ONLY        },
+  { FreezeType::PREPARE_UPGRADE,    proto::FreezeType::PREPARE_UPGRADE    },
+  { FreezeType::FREEZE_UPGRADE,     proto::FreezeType::FREEZE_UPGRADE     },
+  { FreezeType::FREEZE_ABORT,       proto::FreezeType::FREEZE_ABORT       },
+  { FreezeType::TELEMETRY_UPGRADE,  proto::FreezeType::TELEMETRY_UPGRADE  },
 };
 
 //-----
 const std::unordered_map<FreezeType, const char*> gFreezeTypeToString = {
-  { FreezeType::UNKNOWN_FREEZE_TYPE, "UNKNOWN_FREEZE_TYPE" },
-  { FreezeType::FREEZE_ONLY,         "FREEZE_ONLY"         },
-  { FreezeType::PREPARE_UPGRADE,     "PREPARE_UPGRADE"     },
-  { FreezeType::FREEZE_UPGRADE,      "FREEZE_UPGRADE"      },
-  { FreezeType::FREEZE_ABORT,        "FREEZE_ABORT"        },
-  { FreezeType::TELEMETRY_UPGRADE,   "TELEMETRY_UPGRADE"   },
+  {FreezeType::UNKNOWN_FREEZE_TYPE, "UNKNOWN_FREEZE_TYPE"},
+  { FreezeType::FREEZE_ONLY,        "FREEZE_ONLY"        },
+  { FreezeType::PREPARE_UPGRADE,    "PREPARE_UPGRADE"    },
+  { FreezeType::FREEZE_UPGRADE,     "FREEZE_UPGRADE"     },
+  { FreezeType::FREEZE_ABORT,       "FREEZE_ABORT"       },
+  { FreezeType::TELEMETRY_UPGRADE,  "TELEMETRY_UPGRADE"  },
 };
 
 } // namespace Hiero