mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-30 00:38:03 +00:00
refactor: Change config section and key string literals into constants (#7095)
Co-authored-by: Bart <11445373+bthomee@users.noreply.github.com>
This commit is contained in:
@@ -4,11 +4,11 @@
|
||||
|
||||
#include <xrpld/app/misc/ValidatorKeys.h>
|
||||
#include <xrpld/core/Config.h>
|
||||
#include <xrpld/core/ConfigSections.h>
|
||||
|
||||
#include <xrpl/basics/base64.h>
|
||||
#include <xrpl/beast/unit_test/suite.h>
|
||||
#include <xrpl/beast/utility/Journal.h>
|
||||
#include <xrpl/config/Constants.h>
|
||||
#include <xrpl/protocol/KeyType.h>
|
||||
#include <xrpl/protocol/PublicKey.h>
|
||||
#include <xrpl/protocol/SecretKey.h>
|
||||
@@ -100,7 +100,7 @@ public:
|
||||
{
|
||||
// validation seed section -> empty manifest and valid seeds
|
||||
Config c;
|
||||
c.section(SECTION_VALIDATION_SEED).append(seed_);
|
||||
c.section(Sections::kValidationSeed).append(seed_);
|
||||
|
||||
ValidatorKeys k{c, journal};
|
||||
if (BEAST_EXPECT(k.keys); k.keys.has_value())
|
||||
@@ -116,7 +116,7 @@ public:
|
||||
{
|
||||
// validation seed bad seed -> invalid
|
||||
Config c;
|
||||
c.section(SECTION_VALIDATION_SEED).append("badseed");
|
||||
c.section(Sections::kValidationSeed).append("badseed");
|
||||
|
||||
ValidatorKeys const k{c, journal};
|
||||
BEAST_EXPECT(k.configInvalid());
|
||||
@@ -127,7 +127,7 @@ public:
|
||||
{
|
||||
// validator token
|
||||
Config c;
|
||||
c.section(SECTION_VALIDATOR_TOKEN).append(tokenBlob_);
|
||||
c.section(Sections::kValidatorToken).append(tokenBlob_);
|
||||
ValidatorKeys k{c, journal};
|
||||
|
||||
if (BEAST_EXPECT(k.keys); k.keys.has_value())
|
||||
@@ -142,7 +142,7 @@ public:
|
||||
{
|
||||
// invalid validator token
|
||||
Config c;
|
||||
c.section(SECTION_VALIDATOR_TOKEN).append("badtoken");
|
||||
c.section(Sections::kValidatorToken).append("badtoken");
|
||||
ValidatorKeys const k{c, journal};
|
||||
BEAST_EXPECT(k.configInvalid());
|
||||
BEAST_EXPECT(!k.keys);
|
||||
@@ -152,8 +152,8 @@ public:
|
||||
{
|
||||
// Cannot specify both
|
||||
Config c;
|
||||
c.section(SECTION_VALIDATION_SEED).append(seed_);
|
||||
c.section(SECTION_VALIDATOR_TOKEN).append(tokenBlob_);
|
||||
c.section(Sections::kValidationSeed).append(seed_);
|
||||
c.section(Sections::kValidatorToken).append(tokenBlob_);
|
||||
ValidatorKeys const k{c, journal};
|
||||
|
||||
BEAST_EXPECT(k.configInvalid());
|
||||
@@ -164,7 +164,7 @@ public:
|
||||
{
|
||||
// Token manifest and private key must match
|
||||
Config c;
|
||||
c.section(SECTION_VALIDATOR_TOKEN).append(invalidTokenBlob_);
|
||||
c.section(Sections::kValidatorToken).append(invalidTokenBlob_);
|
||||
ValidatorKeys const k{c, journal};
|
||||
|
||||
BEAST_EXPECT(k.configInvalid());
|
||||
|
||||
Reference in New Issue
Block a user