mirror of
https://github.com/XRPLF/rippled.git
synced 2026-04-29 15:37:57 +00:00
chore: Set ColumnLimit to 120 in clang-format (#6288)
This change updates the ColumnLimit from 80 to 120, and applies clang-format to reformat the code.
This commit is contained in:
@@ -27,8 +27,7 @@ struct key_strings
|
||||
|
||||
namespace common {
|
||||
static char const* passphrase = "REINDEER FLOTILLA";
|
||||
static char const* master_key =
|
||||
"SCAT BERN ISLE FOR ROIL BUS SOAK AQUA FREE FOR DRAM BRIG";
|
||||
static char const* master_key = "SCAT BERN ISLE FOR ROIL BUS SOAK AQUA FREE FOR DRAM BRIG";
|
||||
static char const* master_seed = "snMwVWs2hZzfDUF3p2tHZ3EgmyhFs";
|
||||
static char const* master_seed_hex = "BE6A670A19B209E112146D0A7ED2AAD7";
|
||||
} // namespace common
|
||||
@@ -94,10 +93,7 @@ public:
|
||||
BEAST_EXPECT(result.isMember(jss::public_key_hex));
|
||||
BEAST_EXPECT(result.isMember(jss::key_type));
|
||||
|
||||
expectEquals(
|
||||
result[jss::key_type],
|
||||
params.isMember(jss::key_type) ? params[jss::key_type]
|
||||
: "secp256k1");
|
||||
expectEquals(result[jss::key_type], params.isMember(jss::key_type) ? params[jss::key_type] : "secp256k1");
|
||||
BEAST_EXPECT(!result.isMember(jss::warning));
|
||||
|
||||
std::string seed = result[jss::master_seed].asString();
|
||||
@@ -119,17 +115,12 @@ public:
|
||||
expectEquals(result[jss::master_seed_hex], s.master_seed_hex);
|
||||
expectEquals(result[jss::public_key], s.public_key);
|
||||
expectEquals(result[jss::public_key_hex], s.public_key_hex);
|
||||
expectEquals(
|
||||
result[jss::key_type],
|
||||
params.isMember(jss::key_type) ? params[jss::key_type]
|
||||
: "secp256k1");
|
||||
expectEquals(result[jss::key_type], params.isMember(jss::key_type) ? params[jss::key_type] : "secp256k1");
|
||||
return result;
|
||||
}
|
||||
|
||||
void
|
||||
testSeed(
|
||||
std::optional<std::string> const& keyType,
|
||||
key_strings const& strings)
|
||||
testSeed(std::optional<std::string> const& keyType, key_strings const& strings)
|
||||
{
|
||||
testcase("seed");
|
||||
|
||||
@@ -143,9 +134,7 @@ public:
|
||||
}
|
||||
|
||||
void
|
||||
testSeedHex(
|
||||
std::optional<std::string> const& keyType,
|
||||
key_strings const& strings)
|
||||
testSeedHex(std::optional<std::string> const& keyType, key_strings const& strings)
|
||||
{
|
||||
testcase("seed_hex");
|
||||
|
||||
@@ -159,10 +148,7 @@ public:
|
||||
}
|
||||
|
||||
void
|
||||
testLegacyPassphrase(
|
||||
char const* value,
|
||||
std::optional<std::string> const& keyType,
|
||||
key_strings const& strings)
|
||||
testLegacyPassphrase(char const* value, std::optional<std::string> const& keyType, key_strings const& strings)
|
||||
{
|
||||
Json::Value params;
|
||||
if (keyType)
|
||||
@@ -177,9 +163,7 @@ public:
|
||||
}
|
||||
|
||||
void
|
||||
testLegacyPassphrase(
|
||||
std::optional<std::string> const& keyType,
|
||||
key_strings const& strings)
|
||||
testLegacyPassphrase(std::optional<std::string> const& keyType, key_strings const& strings)
|
||||
{
|
||||
testcase("passphrase");
|
||||
|
||||
@@ -190,9 +174,7 @@ public:
|
||||
}
|
||||
|
||||
void
|
||||
testKeyType(
|
||||
std::optional<std::string> const& keyType,
|
||||
key_strings const& strings)
|
||||
testKeyType(std::optional<std::string> const& keyType, key_strings const& strings)
|
||||
{
|
||||
testcase(keyType ? *keyType : "no key_type");
|
||||
|
||||
@@ -223,9 +205,7 @@ public:
|
||||
params[jss::passphrase] = 20160506;
|
||||
auto result = walletPropose(params);
|
||||
BEAST_EXPECT(contains_error(result));
|
||||
BEAST_EXPECT(
|
||||
result[jss::error_message] ==
|
||||
"Invalid field 'passphrase', not string.");
|
||||
BEAST_EXPECT(result[jss::error_message] == "Invalid field 'passphrase', not string.");
|
||||
}
|
||||
|
||||
{
|
||||
@@ -234,9 +214,7 @@ public:
|
||||
params[jss::seed] = Json::objectValue;
|
||||
auto result = walletPropose(params);
|
||||
BEAST_EXPECT(contains_error(result));
|
||||
BEAST_EXPECT(
|
||||
result[jss::error_message] ==
|
||||
"Invalid field 'seed', not string.");
|
||||
BEAST_EXPECT(result[jss::error_message] == "Invalid field 'seed', not string.");
|
||||
}
|
||||
|
||||
{
|
||||
@@ -245,9 +223,7 @@ public:
|
||||
params[jss::seed_hex] = Json::arrayValue;
|
||||
auto result = walletPropose(params);
|
||||
BEAST_EXPECT(contains_error(result));
|
||||
BEAST_EXPECT(
|
||||
result[jss::error_message] ==
|
||||
"Invalid field 'seed_hex', not string.");
|
||||
BEAST_EXPECT(result[jss::error_message] == "Invalid field 'seed_hex', not string.");
|
||||
}
|
||||
|
||||
// Specifying multiple items at once
|
||||
@@ -281,9 +257,7 @@ public:
|
||||
params[jss::seed_hex] = common::master_seed_hex;
|
||||
auto result = walletPropose(params);
|
||||
BEAST_EXPECT(contains_error(result));
|
||||
BEAST_EXPECT(
|
||||
result[jss::error_message] ==
|
||||
"Invalid field 'key_type', not string.");
|
||||
BEAST_EXPECT(result[jss::error_message] == "Invalid field 'key_type', not string.");
|
||||
}
|
||||
|
||||
{
|
||||
@@ -292,22 +266,16 @@ public:
|
||||
params[jss::seed] = common::master_seed;
|
||||
auto result = walletPropose(params);
|
||||
BEAST_EXPECT(contains_error(result));
|
||||
BEAST_EXPECT(
|
||||
result[jss::error_message] ==
|
||||
"Invalid field 'key_type', not string.");
|
||||
BEAST_EXPECT(result[jss::error_message] == "Invalid field 'key_type', not string.");
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
testKeypairForSignature(
|
||||
std::optional<std::string> keyType,
|
||||
key_strings const& strings)
|
||||
testKeypairForSignature(std::optional<std::string> keyType, key_strings const& strings)
|
||||
{
|
||||
testcase(
|
||||
"keypairForSignature - " + (keyType ? *keyType : "no key_type"));
|
||||
testcase("keypairForSignature - " + (keyType ? *keyType : "no key_type"));
|
||||
|
||||
auto const publicKey = parseBase58<PublicKey>(
|
||||
TokenType::AccountPublic, strings.public_key);
|
||||
auto const publicKey = parseBase58<PublicKey>(TokenType::AccountPublic, strings.public_key);
|
||||
BEAST_EXPECT(publicKey);
|
||||
|
||||
if (!keyType)
|
||||
@@ -417,9 +385,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'secret', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'secret', not string.");
|
||||
}
|
||||
|
||||
{
|
||||
@@ -431,9 +397,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'secret', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'secret', not string.");
|
||||
}
|
||||
|
||||
{
|
||||
@@ -446,9 +410,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'secret', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'secret', not string.");
|
||||
}
|
||||
|
||||
// Specify "secret" and "key_type"
|
||||
@@ -461,9 +423,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"The secret field is not allowed if key_type is used.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "The secret field is not allowed if key_type is used.");
|
||||
}
|
||||
|
||||
// Specify unknown or bad "key_type"
|
||||
@@ -476,8 +436,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] == "Invalid field 'key_type'.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'key_type'.");
|
||||
}
|
||||
|
||||
{
|
||||
@@ -489,9 +448,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'key_type', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'key_type', not string.");
|
||||
}
|
||||
|
||||
{
|
||||
@@ -503,9 +460,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'key_type', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'key_type', not string.");
|
||||
}
|
||||
|
||||
// Specify non-string passphrase
|
||||
@@ -518,9 +473,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'passphrase', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'passphrase', not string.");
|
||||
}
|
||||
|
||||
{ // not a passphrase: object
|
||||
@@ -532,9 +485,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'passphrase', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'passphrase', not string.");
|
||||
}
|
||||
|
||||
{ // not a passphrase: array
|
||||
@@ -546,9 +497,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'passphrase', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'passphrase', not string.");
|
||||
}
|
||||
|
||||
{ // not a passphrase: empty string
|
||||
@@ -573,9 +522,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'seed', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed', not string.");
|
||||
}
|
||||
|
||||
{ // not a string: object
|
||||
@@ -587,9 +534,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'seed', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed', not string.");
|
||||
}
|
||||
|
||||
{ // not a string: array
|
||||
@@ -601,9 +546,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'seed', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed', not string.");
|
||||
}
|
||||
|
||||
{ // not a seed: empty
|
||||
@@ -652,9 +595,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'seed_hex', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed_hex', not string.");
|
||||
}
|
||||
|
||||
{ // not a string: object
|
||||
@@ -666,9 +607,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'seed_hex', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed_hex', not string.");
|
||||
}
|
||||
|
||||
{ // not a string: array
|
||||
@@ -680,9 +619,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(!ret);
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Invalid field 'seed_hex', not string.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed_hex', not string.");
|
||||
}
|
||||
|
||||
{ // empty
|
||||
@@ -725,8 +662,7 @@ public:
|
||||
Json::Value params;
|
||||
Json::Value error;
|
||||
params[jss::key_type] = "secp256k1";
|
||||
params[jss::seed_hex] =
|
||||
"BE6A670A19B209E112146D0A7ED2AAD72567D0FC913";
|
||||
params[jss::seed_hex] = "BE6A670A19B209E112146D0A7ED2AAD72567D0FC913";
|
||||
|
||||
auto ret = keypairForSignature(params, error);
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
@@ -767,9 +703,7 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Specified seed is for an Ed25519 wallet.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Specified seed is for an Ed25519 wallet.");
|
||||
}
|
||||
|
||||
{
|
||||
@@ -799,60 +733,26 @@ public:
|
||||
auto ret = keypairForSignature(params, error);
|
||||
|
||||
BEAST_EXPECT(contains_error(error));
|
||||
BEAST_EXPECT(
|
||||
error[jss::error_message] ==
|
||||
"Specified seed is for an Ed25519 wallet.");
|
||||
BEAST_EXPECT(error[jss::error_message] == "Specified seed is for an Ed25519 wallet.");
|
||||
}
|
||||
};
|
||||
|
||||
test(
|
||||
"sEdVWZmeUDgQdMEFKTK9kYVX71FKB7o",
|
||||
"r34XnDB2zS11NZ1wKJzpU1mjWExGVugTaQ");
|
||||
test(
|
||||
"sEd7zJoVnqg1FxB9EuaHC1AB5UPfHWz",
|
||||
"rDw51qRrBEeMw7Na1Nh79LN7HYZDo7nZFE");
|
||||
test(
|
||||
"sEdSxVntbihdLyabbfttMCqsaaucVR9",
|
||||
"rwiyBDfAYegXZyaQcN2L1vAbKRYn2wNFMq");
|
||||
test(
|
||||
"sEdSVwJjEXTYCztqDK4JD9WByH3otDX",
|
||||
"rQJ4hZzNGkLQhLtKPCmu1ywEw1ai2vgUJN");
|
||||
test(
|
||||
"sEdV3jXjKuUoQTSr1Rb4yw8Kyn9r46U",
|
||||
"rERRw2Pxbau4tevE61V5vZUwD7Rus5Y6vW");
|
||||
test(
|
||||
"sEdVeUZjuYT47Uy51FQCnzivsuWyiwB",
|
||||
"rszewT5gRjUgWNEmnfMjvVYzJCkhvWY32i");
|
||||
test(
|
||||
"sEd7MHTewdw4tFYeS7rk7XT4qHiA9jH",
|
||||
"rBB2rvnf4ztwjgNhinFXQJ91nAZjkFgR3p");
|
||||
test(
|
||||
"sEd7A5jFBSdWbNeKGriQvLr1thBScJh",
|
||||
"rLAXz8Nz7aDivz7PwThsLFqaKrizepNCdA");
|
||||
test(
|
||||
"sEdVPU9M2uyzVNT4Yb5Dn4tUtYjbFAw",
|
||||
"rHbHRFPCxD5fnn98TBzsQHJ7SsRq7eHkRj");
|
||||
test(
|
||||
"sEdVfF2zhAmS8gfMYzJ4yWBMeR4BZKc",
|
||||
"r9PsneKHcAE7kUfiTixomM5Mnwi28tCc7h");
|
||||
test(
|
||||
"sEdTjRtcsQkwthDXUSLi9DHNyJcR8GW",
|
||||
"rM4soF4XS3wZrmLurvE6ZmudG16Lk5Dur5");
|
||||
test(
|
||||
"sEdVNKeu1Lhpfh7Nf6tRDbxnmMyZ4Dv",
|
||||
"r4ZwJxq6FDtWjapDtCGhjG6mtNm1nWdJcD");
|
||||
test(
|
||||
"sEd7bK4gf5BHJ1WbaEWx8pKMA9MLHpC",
|
||||
"rD6tnn51m4o1uXeEK9CFrZ3HR7DcFhiYnp");
|
||||
test(
|
||||
"sEd7jCh3ppnQMsLdGcZ6TZayZaHhBLg",
|
||||
"rTcBkiRQ1EfFQ4FCCwqXNHpn1yUTAACkj");
|
||||
test(
|
||||
"sEdTFJezurQwSJAbkLygj2gQXBut2wh",
|
||||
"rnXaMacNbRwcJddbbPbqdcpSUQcfzFmrR8");
|
||||
test(
|
||||
"sEdSWajfQAAWFuDvVZF3AiGucReByLt",
|
||||
"rBJtow6V3GTdsWMamrxetRDwWs6wwTxcKa");
|
||||
test("sEdVWZmeUDgQdMEFKTK9kYVX71FKB7o", "r34XnDB2zS11NZ1wKJzpU1mjWExGVugTaQ");
|
||||
test("sEd7zJoVnqg1FxB9EuaHC1AB5UPfHWz", "rDw51qRrBEeMw7Na1Nh79LN7HYZDo7nZFE");
|
||||
test("sEdSxVntbihdLyabbfttMCqsaaucVR9", "rwiyBDfAYegXZyaQcN2L1vAbKRYn2wNFMq");
|
||||
test("sEdSVwJjEXTYCztqDK4JD9WByH3otDX", "rQJ4hZzNGkLQhLtKPCmu1ywEw1ai2vgUJN");
|
||||
test("sEdV3jXjKuUoQTSr1Rb4yw8Kyn9r46U", "rERRw2Pxbau4tevE61V5vZUwD7Rus5Y6vW");
|
||||
test("sEdVeUZjuYT47Uy51FQCnzivsuWyiwB", "rszewT5gRjUgWNEmnfMjvVYzJCkhvWY32i");
|
||||
test("sEd7MHTewdw4tFYeS7rk7XT4qHiA9jH", "rBB2rvnf4ztwjgNhinFXQJ91nAZjkFgR3p");
|
||||
test("sEd7A5jFBSdWbNeKGriQvLr1thBScJh", "rLAXz8Nz7aDivz7PwThsLFqaKrizepNCdA");
|
||||
test("sEdVPU9M2uyzVNT4Yb5Dn4tUtYjbFAw", "rHbHRFPCxD5fnn98TBzsQHJ7SsRq7eHkRj");
|
||||
test("sEdVfF2zhAmS8gfMYzJ4yWBMeR4BZKc", "r9PsneKHcAE7kUfiTixomM5Mnwi28tCc7h");
|
||||
test("sEdTjRtcsQkwthDXUSLi9DHNyJcR8GW", "rM4soF4XS3wZrmLurvE6ZmudG16Lk5Dur5");
|
||||
test("sEdVNKeu1Lhpfh7Nf6tRDbxnmMyZ4Dv", "r4ZwJxq6FDtWjapDtCGhjG6mtNm1nWdJcD");
|
||||
test("sEd7bK4gf5BHJ1WbaEWx8pKMA9MLHpC", "rD6tnn51m4o1uXeEK9CFrZ3HR7DcFhiYnp");
|
||||
test("sEd7jCh3ppnQMsLdGcZ6TZayZaHhBLg", "rTcBkiRQ1EfFQ4FCCwqXNHpn1yUTAACkj");
|
||||
test("sEdTFJezurQwSJAbkLygj2gQXBut2wh", "rnXaMacNbRwcJddbbPbqdcpSUQcfzFmrR8");
|
||||
test("sEdSWajfQAAWFuDvVZF3AiGucReByLt", "rBJtow6V3GTdsWMamrxetRDwWs6wwTxcKa");
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user