Fix mismatch error when owner is in wrong format (#641)

Fixes #642
This commit is contained in:
cyan317
2023-05-16 14:26:08 +01:00
committed by GitHub
parent 6f93e1003e
commit 2e3e8cd779
2 changed files with 18 additions and 12 deletions

View File

@@ -109,7 +109,10 @@ public:
validation::IfType<std::string>{validation::Uint256HexStringValidator},
validation::IfType<boost::json::object>{
validation::Section{
{JS(owner), validation::Required{}, validation::AccountBase58Validator},
{JS(owner),
validation::Required{},
validation::WithCustomError{
validation::AccountBase58Validator, Status(ClioError::rpcMALFORMED_OWNER)}},
{JS(authorized), validation::Required{}, validation::AccountBase58Validator},
},
}},
@@ -125,7 +128,10 @@ public:
validation::IfType<std::string>{validation::Uint256HexStringValidator},
validation::IfType<boost::json::object>{
validation::Section{
{JS(owner), validation::Required{}, validation::AccountBase58Validator},
{JS(owner),
validation::Required{},
validation::WithCustomError{
validation::AccountBase58Validator, Status(ClioError::rpcMALFORMED_OWNER)}},
{JS(seq), validation::Required{}, validation::Type<uint32_t>{}},
},
}},

View File

@@ -135,8 +135,8 @@ generateTestValuesForParametersTest()
"authorized": "invalid"
}
})",
"malformedAddress",
"Malformed address."},
"malformedOwner",
"Malformed owner."},
ParamTestCaseBundle{
"InvalidDepositPreauthJsonOwnerNotString",
@@ -146,8 +146,8 @@ generateTestValuesForParametersTest()
"authorized": 123
}
})",
"invalidParams",
"ownerNotString"},
"malformedOwner",
"Malformed owner."},
ParamTestCaseBundle{
"InvalidDepositPreauthJsonAuthorizedNotString",
@@ -312,19 +312,19 @@ generateTestValuesForParametersTest()
"seq": 123
}
})",
"invalidParams",
"ownerNotString"},
"malformedOwner",
"Malformed owner."},
ParamTestCaseBundle{
"InvalidEscrowJsonAccountInvalid",
R"({
"ticket": {
"account": "123",
"escrow": {
"owner": "123",
"seq": 123
}
})",
"malformedAddress",
"Malformed address."},
"malformedOwner",
"Malformed owner."},
ParamTestCaseBundle{
"InvalidEscrowJsonSeqNotInt",