diff --git a/src/test/app/BaseFee_test.cpp b/src/test/app/BaseFee_test.cpp index b6600e40f..97de93631 100644 --- a/src/test/app/BaseFee_test.cpp +++ b/src/test/app/BaseFee_test.cpp @@ -582,9 +582,9 @@ class BaseFee_test : public beast::unit_test::suite } void - testSignersListSet(FeatureBitset features) + testSignerListSet(FeatureBitset features) { - testcase("signers list set w/ hook params"); + testcase("signer list set w/ hook params"); using namespace test::jtx; using namespace std::literals; @@ -810,7 +810,7 @@ class BaseFee_test : public beast::unit_test::suite testPaymentChannelFund(features); testSetHook(features); testSetRegularKey(features); - testSignersListSet(features); + testSignerListSet(features); testTicketCreate(features); testTrustSet(features); testURITokenBurnFee(features); diff --git a/src/test/app/Import_json.h b/src/test/app/Import_json.h index 37cd6363f..22982ea01 100644 --- a/src/test/app/Import_json.h +++ b/src/test/app/Import_json.h @@ -879,7 +879,7 @@ inline std::string ImportTCSetRegularKey::w_signers = R"json({ } })json"; -class ImportTCSignersListSet +class ImportTCSignerListSet { public: static std::string w_seed_bad_fee; @@ -891,7 +891,7 @@ public: static std::string w_signers_empty; }; -inline std::string ImportTCSignersListSet::w_seed_bad_fee = R"json({ +inline std::string ImportTCSignerListSet::w_seed_bad_fee = R"json({ "ledger": { "acroot": "64F75A08037D9F8ED8A103893401EB2AD726E7D6AAC3EAA249005916A9354892", "close": 743008501, @@ -952,7 +952,7 @@ inline std::string ImportTCSignersListSet::w_seed_bad_fee = R"json({ } } })json"; -inline std::string ImportTCSignersListSet::w_seed = R"json({ +inline std::string ImportTCSignerListSet::w_seed = R"json({ "ledger": { "acroot": "8112FF5F3FEEA34894A16CCCD64A24D552521F2E699780A587A9E6F5F5117CE5", "close": 743008510, @@ -993,7 +993,7 @@ inline std::string ImportTCSignersListSet::w_seed = R"json({ } } })json"; -inline std::string ImportTCSignersListSet::w_regular_key = R"json({ +inline std::string ImportTCSignerListSet::w_regular_key = R"json({ "ledger": { "acroot": "2A25CA219781A3144C72FD5FB6EB62763214E050050DA6176624A046C51EECBD", "close": 743015350, @@ -1034,7 +1034,7 @@ inline std::string ImportTCSignersListSet::w_regular_key = R"json({ } } })json"; -inline std::string ImportTCSignersListSet::w_signers = R"json({ +inline std::string ImportTCSignerListSet::w_signers = R"json({ "ledger": { "acroot": "BC35E65B52724CF258BDAC8B8E0D3B9CA0F012F5B243F6AAD1B671EDABD5188E", "close": 745594953, @@ -1075,7 +1075,7 @@ inline std::string ImportTCSignersListSet::w_signers = R"json({ } } })json"; -inline std::string ImportTCSignersListSet::w_seed_empty = R"json({ +inline std::string ImportTCSignerListSet::w_seed_empty = R"json({ "ledger": { "acroot": "ECCAFDE52A6D5F1E36EB82EAA5247FF1D8ADE51FCF1ED0842850193018A510F7", "close": 743056482, @@ -1116,7 +1116,7 @@ inline std::string ImportTCSignersListSet::w_seed_empty = R"json({ } } })json"; -inline std::string ImportTCSignersListSet::w_regular_key_empty = R"json({ +inline std::string ImportTCSignerListSet::w_regular_key_empty = R"json({ "ledger": { "acroot": "E222F46D5F35C79FDA3BB98973E2024EF9F6FA7B26471CC9CEF2CE033FA0E6E7", "close": 743169800, @@ -1157,7 +1157,7 @@ inline std::string ImportTCSignersListSet::w_regular_key_empty = R"json({ } } })json"; -inline std::string ImportTCSignersListSet::w_signers_empty = R"json({ +inline std::string ImportTCSignerListSet::w_signers_empty = R"json({ "ledger": { "acroot": "987438A87AD998B7D7ED04A280FB5414C76E8475D621A55FB8463F15CEEEAD49", "close": 743172592, @@ -1261,4 +1261,4 @@ inline std::string ImportTCHalving::base_genesis = R"json({ } // namespace test } // namespace ripple -#endif \ No newline at end of file +#endif diff --git a/src/test/app/Import_test.cpp b/src/test/app/Import_test.cpp index f9fb090be..1a65de486 100644 --- a/src/test/app/Import_test.cpp +++ b/src/test/app/Import_test.cpp @@ -1898,7 +1898,7 @@ class Import_test : public beast::unit_test::suite // different keys. { auto const xpopJson = - import::loadXpop(ImportTCSignersListSet::w_signers); + import::loadXpop(ImportTCSignerListSet::w_signers); env(import::import(alice, xpopJson), msig(bob, dave), fee((3 * feeDrops) * 10), @@ -1910,7 +1910,7 @@ class Import_test : public beast::unit_test::suite // different keys. - empty innerSigners { Json::Value xpopJson = - import::loadXpop(ImportTCSignersListSet::w_signers); + import::loadXpop(ImportTCSignerListSet::w_signers); xpopJson[jss::transaction][jss::blob] = "12000C22000000002400000014201B0000002B201D00005359202300000002" "6840000000001E84B073008114AE123A8556F3CF91154711376AFB0F894F83" @@ -1927,7 +1927,7 @@ class Import_test : public beast::unit_test::suite // different keys. { Json::Value xpopJson = - import::loadXpop(ImportTCSignersListSet::w_signers); + import::loadXpop(ImportTCSignerListSet::w_signers); xpopJson[jss::transaction][jss::blob] = "12000C22000000002400000014201B0000002B201D00005359202300000002" "6840000000001E84B073008114AE123A8556F3CF91154711376AFB0F894F83" @@ -1953,7 +1953,7 @@ class Import_test : public beast::unit_test::suite // temMALFORMED - Import: inner txn signature verify failed { Json::Value xpopJson = - import::loadXpop(ImportTCSignersListSet::w_signers); + import::loadXpop(ImportTCSignerListSet::w_signers); xpopJson[jss::transaction][jss::blob] = "12000C2200000008240000001A201B000003B9201D00005359202300000000" "6840000000001E84B073008114AE123A8556F3CF91154711376AFB0F894F83" @@ -2768,7 +2768,7 @@ class Import_test : public beast::unit_test::suite env.close(); } - // tefIMPORT_BLACKHOLED - SignersListSet (w/seed) + // tefIMPORT_BLACKHOLED - SignerListSet (w/seed) { test::jtx::Env env{ *this, network::makeNetworkVLConfig(21337, keys)}; @@ -2792,7 +2792,7 @@ class Import_test : public beast::unit_test::suite // Import with Master Key Json::Value tmpXpop = - import::loadXpop(ImportTCSignersListSet::w_seed); + import::loadXpop(ImportTCSignerListSet::w_seed); env(import::import(alice, tmpXpop), ter(tefIMPORT_BLACKHOLED), fee(feeDrops * 10), @@ -3244,7 +3244,7 @@ class Import_test : public beast::unit_test::suite env(noop(alice), sig(bob), fee(feeDrops), ter(tefBAD_AUTH)); } - // w/ signers list -> dne + // w/ signer list -> dne { test::jtx::Env env{ *this, network::makeNetworkVLConfig(21337, keys)}; @@ -3975,7 +3975,7 @@ class Import_test : public beast::unit_test::suite env(noop(alice), sig(carol), fee(feeDrops), ter(tesSUCCESS)); } - // w/ signers list -> funded (update regular key) + // w/ signer list -> funded (update regular key) { test::jtx::Env env{ *this, network::makeNetworkVLConfig(21337, keys)}; @@ -4049,7 +4049,7 @@ class Import_test : public beast::unit_test::suite BEAST_EXPECT(acctSle->getAccountID(sfRegularKey) == dave.id()); env(noop(alice), sig(dave), fee(feeDrops), ter(tesSUCCESS)); - // confirm signers list not set + // confirm signer list not set auto const k = keylet::signers(alice); BEAST_EXPECT(env.current()->read(k) == nullptr); } @@ -4351,9 +4351,9 @@ class Import_test : public beast::unit_test::suite } void - testSignersListSet(FeatureBitset features) + testSignerListSet(FeatureBitset features) { - testcase("signers list set tx"); + testcase("signer list set tx"); using namespace test::jtx; using namespace std::literals; @@ -4394,7 +4394,7 @@ class Import_test : public beast::unit_test::suite // import tx auto const xpopJson = - import::loadXpop(ImportTCSignersListSet::w_seed_bad_fee); + import::loadXpop(ImportTCSignerListSet::w_seed_bad_fee); Json::Value tx = import::import(alice, xpopJson); tx[jss::Sequence] = 0; // tx[jss::Fee] = 0; @@ -4438,7 +4438,7 @@ class Import_test : public beast::unit_test::suite // import tx auto const xpopJson = - import::loadXpop(ImportTCSignersListSet::w_seed); + import::loadXpop(ImportTCSignerListSet::w_seed); Json::Value tx = import::import(alice, xpopJson); tx[jss::Sequence] = 0; tx[jss::Fee] = 0; @@ -4523,7 +4523,7 @@ class Import_test : public beast::unit_test::suite // import tx auto const burnAmt = XRP(2); auto const xpopJson = - import::loadXpop(ImportTCSignersListSet::w_regular_key); + import::loadXpop(ImportTCSignerListSet::w_regular_key); Json::Value tx = import::import(alice, xpopJson); tx[jss::Sequence] = 0; tx[jss::Fee] = 0; @@ -4614,7 +4614,7 @@ class Import_test : public beast::unit_test::suite // import tx auto const xpopJson = - import::loadXpop(ImportTCSignersListSet::w_signers); + import::loadXpop(ImportTCSignerListSet::w_signers); Json::Value tx = import::import(alice, xpopJson); tx[jss::Sequence] = 0; tx[jss::Fee] = 0; @@ -4685,7 +4685,7 @@ class Import_test : public beast::unit_test::suite // import tx auto const xpopJson = - import::loadXpop(ImportTCSignersListSet::w_seed); + import::loadXpop(ImportTCSignerListSet::w_seed); env(import::import(alice, xpopJson), fee(feeDrops * 10), ter(tesSUCCESS)); @@ -4771,7 +4771,7 @@ class Import_test : public beast::unit_test::suite auto const envAlice = env.balance(alice); BEAST_EXPECT(envAlice == XRP(1000)); - // set the signers list + // set the signer list env(signers(alice, 2, {{bob, 1}, {carol, 1}})); env(noop(alice), msig(bob, carol), @@ -4787,7 +4787,7 @@ class Import_test : public beast::unit_test::suite // import tx auto const xpopJson = - import::loadXpop(ImportTCSignersListSet::w_seed_empty); + import::loadXpop(ImportTCSignerListSet::w_seed_empty); env(import::import(alice, xpopJson), fee(feeDrops * 10), ter(tesSUCCESS)); @@ -4852,7 +4852,7 @@ class Import_test : public beast::unit_test::suite env(noop(alice), sig(bob), fee(feeDrops), ter(tesSUCCESS)); env.close(); - // set the signers list + // set the signer list env(signers(alice, 2, {{bob, 1}, {carol, 1}})); env(noop(alice), msig(bob, carol), @@ -4868,7 +4868,7 @@ class Import_test : public beast::unit_test::suite // import tx auto const xpopJson = - import::loadXpop(ImportTCSignersListSet::w_regular_key_empty); + import::loadXpop(ImportTCSignerListSet::w_regular_key_empty); env(import::import(alice, xpopJson), fee(feeDrops * 10), sig(bob), @@ -4935,7 +4935,7 @@ class Import_test : public beast::unit_test::suite auto const envAlice = env.balance(alice); BEAST_EXPECT(envAlice == XRP(1000)); - // set the signers list + // set the signer list env(signers(alice, 2, {{bob, 1}, {carol, 1}})); env(noop(alice), msig(bob, carol), @@ -4951,7 +4951,7 @@ class Import_test : public beast::unit_test::suite // import tx auto const xpopJson = - import::loadXpop(ImportTCSignersListSet::w_signers_empty); + import::loadXpop(ImportTCSignerListSet::w_signers_empty); env(import::import(alice, xpopJson), msig(bob, carol), fee((3 * feeDrops) * 10), @@ -6228,7 +6228,7 @@ public: testAccountSetFlags(features); testSetRegularKey(features); testSetRegularKeyFlags(features); - testSignersListSet(features); + testSignerListSet(features); testUsingTickets(features); testAccountIndex(features); testHookIssuer(features); diff --git a/src/test/app/SetHookTSH_test.cpp b/src/test/app/SetHookTSH_test.cpp index 425eedbaf..223a200b8 100644 --- a/src/test/app/SetHookTSH_test.cpp +++ b/src/test/app/SetHookTSH_test.cpp @@ -4492,14 +4492,14 @@ private: } } - // SignersListSet + // SignerListSet // | otxn | tsh | sls | // | A | A | S | // | A | S | S | void - testSignersListSetTSH(FeatureBitset features) + testSignerListSetTSH(FeatureBitset features) { - testcase("signers list set tsh"); + testcase("signer list set tsh"); using namespace test::jtx; using namespace std::literals; @@ -4527,7 +4527,7 @@ private: // set tsh hook setTSHHook(env, account, testStrong); - // signers list set + // signer list set env(signers(account, 2, {{signer1, 1}, {signer2, 1}}), fee(XRP(1)), ter(tesSUCCESS)); @@ -4566,7 +4566,7 @@ private: // set tsh hook setTSHHook(env, signer2, testStrong); - // signers list set + // signer list set env(signers(account, 2, {{signer1, 1}, {signer2, 1}}), fee(XRP(1)), ter(tesSUCCESS)); @@ -6914,7 +6914,7 @@ private: testPaymentChannelFundTSH(features); testSetHookTSH(features); testSetRegularKeyTSH(features); - testSignersListSetTSH(features); + testSignerListSetTSH(features); testTicketCreateTSH(features); testTrustSetTSH(features); testURITokenMintTSH(features); diff --git a/src/test/app/Touch_test.cpp b/src/test/app/Touch_test.cpp index 6943e5d37..f3a545f5d 100644 --- a/src/test/app/Touch_test.cpp +++ b/src/test/app/Touch_test.cpp @@ -880,9 +880,9 @@ private: } void - testSignersListSet(FeatureBitset features) + testSignerListSet(FeatureBitset features) { - testcase("signers list set"); + testcase("signer list set"); using namespace test::jtx; using namespace std::literals; @@ -895,7 +895,7 @@ private: env.fund(XRP(1000), alice, signer1, signer2); env.close(); - // signers list set + // signer list set env(signers(alice, 2, {{signer1, 1}, {signer2, 1}}), ter(tesSUCCESS)); env.close(); @@ -1384,7 +1384,7 @@ private: testPaymentChannelFund(features); testSetHook(features); testSetRegularKey(features); - testSignersListSet(features); + testSignerListSet(features); testTicketCreate(features); testTrustSet(features); testURITokenMint(features);