Use SecretKey, PublicKey

src/ripple/test/jtx/impl/Env.cpp

@@ -44,22 +44,21 @@
 #include <ripple/protocol/TxFlags.h>
 #include <ripple/protocol/types.h>
 #include <memory>
-// VFALCO TODO Use AnyPublicKey, AnySecretKey, AccountID
 
 namespace ripple {
 namespace test {
 
 namespace jtx {
 
-std::shared_ptr<Ledger const>
+std::shared_ptr<Ledger>
 Env::genesis()
 {
-    Account master("master", generateKeysFromSeed(
-        KeyType::secp256k1, RippleAddress::createSeedGeneric(
-            "masterpassphrase")));
+    Account const master("master",
+        generateKeyPair(KeyType::secp256k1,
+            generateSeed("masterpassphrase")));
     auto const ledger =
-        std::make_shared<Ledger>(master.pk(),
-            SYSTEM_CURRENCY_START);
+        std::make_shared<Ledger>(
+            master.id(), SYSTEM_CURRENCY_START);
     ledger->setClosed();
     return ledger;
 }
@@ -67,9 +66,9 @@ Env::genesis()
 // VFALCO Could wrap the log in a Journal here
 Env::Env (beast::unit_test::suite& test_)
     : test(test_)
-    , master("master", generateKeysFromSeed(
-        KeyType::secp256k1, RippleAddress::createSeedGeneric(
-            "masterpassphrase")))
+    , master("master", generateKeyPair(
+        KeyType::secp256k1,
+            generateSeed("masterpassphrase")))
     , closed_ (genesis())
     , cachedSLEs_ (std::chrono::seconds(5), clock)
     , openLedger (closed_, config, cachedSLEs_, journal)