[FOLD] Address PR ValidatorKeys comments

XRPLF · Jul 5, 2017 · 58bf7a5 · 58bf7a5
1 parent d20650e
commit 58bf7a5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/src/ripple/app/misc/ValidatorKeys.h b/src/ripple/app/misc/ValidatorKeys.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_APP_MISC_VALIDATOR_IDENTITY_H_INCLUDED
-#define RIPPLE_APP_MISC_VALIDATOR_IDENTITY_H_INCLUDED
+#ifndef RIPPLE_APP_MISC_VALIDATOR_KEYS_H_INCLUDED
+#define RIPPLE_APP_MISC_VALIDATOR_KEYS_H_INCLUDED
 
 #include <ripple/beast/utility/Journal.h>
 #include <ripple/protocol/PublicKey.h>
@@ -30,7 +30,7 @@ namespace ripple {
 class Config;
 
 /** Validator keys and manifest as set in configuration file.  Values will be
-    emtpy if not configured as a validator or not configured with a manifest.
+    empty if not configured as a validator or not configured with a manifest.
 */
 class ValidatorKeys
 {

diff --git a/src/ripple/app/misc/impl/ValidatorKeys.cpp b/src/ripple/app/misc/impl/ValidatorKeys.cpp
@@ -28,6 +28,15 @@
 namespace ripple {
 ValidatorKeys::ValidatorKeys(Config const& config, beast::Journal j)
 {
+    if (config.exists(SECTION_VALIDATOR_TOKEN) &&
+        config.exists(SECTION_VALIDATION_SEED))
+    {
+        configInvalid_ = true;
+        JLOG(j.fatal()) << "Cannot specify both [" SECTION_VALIDATION_SEED
+                           "] and [" SECTION_VALIDATOR_TOKEN "]";
+        return;
+    }
+
     if (config.exists(SECTION_VALIDATOR_TOKEN))
     {
         if (auto const token = ValidatorToken::make_ValidatorToken(
@@ -41,7 +50,7 @@ ValidatorKeys::ValidatorKeys(Config const& config, beast::Journal j)
         {
             configInvalid_ = true;
             JLOG(j.fatal())
-                << "Invalid entry in validator token configuration.";
+                << "Invalid token specified in [" SECTION_VALIDATOR_TOKEN "]";
         }
     }
     else if (config.exists(SECTION_VALIDATION_SEED))

diff --git a/src/test/app/ValidatorKeys_test.cpp b/src/test/app/ValidatorKeys_test.cpp
@@ -81,8 +81,10 @@ class ValidatorKeys_test : public beast::unit_test::suite
             Config c;
             ValidatorKeys k{c, j};
             BEAST_EXPECT(k.publicKey.size() == 0);
+            BEAST_EXPECT(k.secretKey.size() == 0);
             BEAST_EXPECT(k.manifest.empty());
             BEAST_EXPECT(!k.configInvalid());
+
         }
         {
             // validation seed section -> empty manifest and valid seeds
@@ -104,6 +106,7 @@ class ValidatorKeys_test : public beast::unit_test::suite
             ValidatorKeys k{c, j};
             BEAST_EXPECT(k.configInvalid());
             BEAST_EXPECT(k.publicKey.size() == 0);
+            BEAST_EXPECT(k.secretKey.size() == 0);
             BEAST_EXPECT(k.manifest.empty());
         }
 
@@ -125,20 +128,21 @@ class ValidatorKeys_test : public beast::unit_test::suite
             ValidatorKeys k{c, j};
             BEAST_EXPECT(k.configInvalid());
             BEAST_EXPECT(k.publicKey.size() == 0);
+            BEAST_EXPECT(k.secretKey.size() == 0);
             BEAST_EXPECT(k.manifest.empty());
         }
 
         {
-            // Token takes precedence over seed
+            // Cannot specify both
             Config c;
             c.section(SECTION_VALIDATION_SEED).append(seed);
             c.section(SECTION_VALIDATOR_TOKEN).append(tokenBlob);
             ValidatorKeys k{c, j};
 
-            BEAST_EXPECT(k.publicKey == tokenPublicKey);
-            BEAST_EXPECT(k.secretKey == tokenSecretKey);
-            BEAST_EXPECT(k.manifest == tokenManifest);
-            BEAST_EXPECT(!k.configInvalid());
+            BEAST_EXPECT(k.configInvalid());
+            BEAST_EXPECT(k.publicKey.size() == 0);
+            BEAST_EXPECT(k.secretKey.size() == 0);
+            BEAST_EXPECT(k.manifest.empty());
         }
 
     }