[fold] Rebase on develop

XRPLF · Jul 10, 2023 · 3a6b9e0 · 3a6b9e0
1 parent 89f2f77
commit 3a6b9e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/rpc/handlers/AccountLines.h b/src/rpc/handlers/AccountLines.h
@@ -21,6 +21,7 @@
 
 #include <backend/BackendInterface.h>
 #include <rpc/RPCHelpers.h>
+#include <rpc/common/MetaProcessors.h>
 #include <rpc/common/Types.h>
 #include <rpc/common/Validators.h>
 
@@ -92,9 +93,8 @@ class AccountLinesHandler
  static auto const rpcSpec = RpcSpec{
  {JS(account),
  validation::Required{},
- validation::WithCustomError{validation::AccountValidator, Status(RippledError::rpcACT_MALFORMED)}},
- {JS(peer),
- validation::WithCustomError{validation::AccountValidator, Status(RippledError::rpcACT_MALFORMED)}},
+ meta::WithCustomError{validation::AccountValidator, Status(RippledError::rpcACT_MALFORMED)}},
+ {JS(peer), meta::WithCustomError{validation::AccountValidator, Status(RippledError::rpcACT_MALFORMED)}},
  {JS(ignore_default), validation::Type<bool>{}},
  {JS(ledger_hash), validation::Uint256HexStringValidator},
  {JS(limit), validation::Type<uint32_t>{}, validation::Between{10, 400}},

diff --git a/src/rpc/handlers/LedgerEntry.h b/src/rpc/handlers/LedgerEntry.h
@@ -99,10 +99,10 @@ class LedgerEntryHandler
  }};
 
  static auto const malformedRequestHexStringValidator =
- validation::WithCustomError{validation::Uint256HexStringValidator, Status(ClioError::rpcMALFORMED_REQUEST)};
+ meta::WithCustomError{validation::Uint256HexStringValidator, Status(ClioError::rpcMALFORMED_REQUEST)};
 
  static auto const malformedRequestIntValidator =
- validation::WithCustomError{validation::Type<uint32_t>{}, Status(ClioError::rpcMALFORMED_REQUEST)};
+ meta::WithCustomError{validation::Type<uint32_t>{}, Status(ClioError::rpcMALFORMED_REQUEST)};
 
  static auto const rpcSpec = RpcSpec{
  {JS(binary), validation::Type<bool>{}},