ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-05 08:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix up some pre-existing sequence testcases

Browse Source
This commit is contained in:
Richard Holland
2023-01-23 13:19:47 +00:00
parent 039ce53c00
commit 0aaf98c46e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/jtx/impl/envconfig.cpp
View File

@@ -69,6 +69,7 @@ namespace jtx {
std::unique_ptr<Config> std::unique_ptr<Config>
no_admin(std::unique_ptr<Config> cfg) no_admin(std::unique_ptr<Config> cfg)
{ {
cfg->NETWORK_ID = 21337;
(*cfg)["port_rpc"].set("admin", ""); (*cfg)["port_rpc"].set("admin", "");
(*cfg)["port_ws"].set("admin", ""); (*cfg)["port_ws"].set("admin", "");
return cfg; return cfg;

17
src/test/rpc/LedgerRPC_test.cpp
View File

@@ -1540,20 +1540,19 @@ class LedgerRPC_test : public beast::unit_test::suite
if (BEAST_EXPECT(jrr[jss::queue_data].size() == 2)) if (BEAST_EXPECT(jrr[jss::queue_data].size() == 2))
{ {
const std::string txid1 = [&]() { const std::string txid1 = [&]() {
auto const& txj = jrr[jss::queue_data][1u]; auto const& txj = jrr[jss::queue_data][0u];
BEAST_EXPECT(txj[jss::account] == alice.human()); BEAST_EXPECT(txj[jss::account] == alice.human());
BEAST_EXPECT(txj[jss::fee_level] == "256"); BEAST_EXPECT(txj[jss::fee_level] == "256");
BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS"); BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS");
BEAST_EXPECT(txj["retries_remaining"] == 10); BEAST_EXPECT(txj["retries_remaining"] == 10);
BEAST_EXPECT(txj.isMember(jss::tx)); BEAST_EXPECT(txj.isMember(jss::tx));
auto const& tx = txj[jss::tx]; auto const& tx = txj[jss::tx];
std::cout << tx << "\n";
BEAST_EXPECT(tx[jss::Account] == alice.human()); BEAST_EXPECT(tx[jss::Account] == alice.human());
BEAST_EXPECT(tx[jss::TransactionType] == jss::AccountSet); BEAST_EXPECT(tx[jss::TransactionType] == jss::AccountSet);
return tx[jss::hash].asString(); return tx[jss::hash].asString();
}(); }();
auto const& txj = jrr[jss::queue_data][0u]; auto const& txj = jrr[jss::queue_data][1u];
BEAST_EXPECT(txj[jss::account] == alice.human()); BEAST_EXPECT(txj[jss::account] == alice.human());
BEAST_EXPECT(txj[jss::fee_level] == "256"); BEAST_EXPECT(txj[jss::fee_level] == "256");
BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS"); BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS");
@@ -1566,7 +1565,7 @@ class LedgerRPC_test : public beast::unit_test::suite
uint256 tx0, tx1; uint256 tx0, tx1;
BEAST_EXPECT(tx0.parseHex(txid0)); BEAST_EXPECT(tx0.parseHex(txid0));
BEAST_EXPECT(tx1.parseHex(txid1)); BEAST_EXPECT(tx1.parseHex(txid1));
BEAST_EXPECT((tx0 ^ parentHash) < (tx1 ^ parentHash)); BEAST_EXPECT((tx0 ^ parentHash) > (tx1 ^ parentHash));
return txid0; return txid0;
} }
return std::string{}; return std::string{};
@@ -1581,14 +1580,14 @@ class LedgerRPC_test : public beast::unit_test::suite
{ {
auto const& parentHash = env.current()->info().parentHash; auto const& parentHash = env.current()->info().parentHash;
auto const txid0 = [&]() { auto const txid0 = [&]() {
auto const& txj = jrr[jss::queue_data][0u]; auto const& txj = jrr[jss::queue_data][1u];
BEAST_EXPECT(txj[jss::account] == alice.human()); BEAST_EXPECT(txj[jss::account] == alice.human());
BEAST_EXPECT(txj[jss::fee_level] == "256"); BEAST_EXPECT(txj[jss::fee_level] == "256");
BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS"); BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS");
BEAST_EXPECT(txj.isMember(jss::tx)); BEAST_EXPECT(txj.isMember(jss::tx));
return txj[jss::tx].asString(); return txj[jss::tx].asString();
}(); }();
auto const& txj = jrr[jss::queue_data][1u]; auto const& txj = jrr[jss::queue_data][0u];
BEAST_EXPECT(txj[jss::account] == alice.human()); BEAST_EXPECT(txj[jss::account] == alice.human());
BEAST_EXPECT(txj[jss::fee_level] == "256"); BEAST_EXPECT(txj[jss::fee_level] == "256");
BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS"); BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS");
@@ -1599,7 +1598,7 @@ class LedgerRPC_test : public beast::unit_test::suite
uint256 tx0, tx1; uint256 tx0, tx1;
BEAST_EXPECT(tx0.parseHex(txid0)); BEAST_EXPECT(tx0.parseHex(txid0));
BEAST_EXPECT(tx1.parseHex(txid1)); BEAST_EXPECT(tx1.parseHex(txid1));
BEAST_EXPECT((tx0 ^ parentHash) < (tx1 ^ parentHash)); BEAST_EXPECT((tx0 ^ parentHash) > (tx1 ^ parentHash));
} }
env.close(); env.close();
@@ -1610,7 +1609,7 @@ class LedgerRPC_test : public beast::unit_test::suite
jrr = env.rpc("json", "ledger", to_string(jv))[jss::result]; jrr = env.rpc("json", "ledger", to_string(jv))[jss::result];
if (BEAST_EXPECT(jrr[jss::queue_data].size() == 2)) if (BEAST_EXPECT(jrr[jss::queue_data].size() == 2))
{ {
auto const& txj = jrr[jss::queue_data][1u]; auto const& txj = jrr[jss::queue_data][0u];
BEAST_EXPECT(txj[jss::account] == alice.human()); BEAST_EXPECT(txj[jss::account] == alice.human());
BEAST_EXPECT(txj[jss::fee_level] == "256"); BEAST_EXPECT(txj[jss::fee_level] == "256");
BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS"); BEAST_EXPECT(txj["preflight_result"] == "tesSUCCESS");
@@ -1619,7 +1618,7 @@ class LedgerRPC_test : public beast::unit_test::suite
BEAST_EXPECT(txj.isMember(jss::tx)); BEAST_EXPECT(txj.isMember(jss::tx));
BEAST_EXPECT(txj[jss::tx].isMember(jss::tx_blob)); BEAST_EXPECT(txj[jss::tx].isMember(jss::tx_blob));
auto const& txj2 = jrr[jss::queue_data][0u]; auto const& txj2 = jrr[jss::queue_data][1u];
BEAST_EXPECT(txj2[jss::account] == alice.human()); BEAST_EXPECT(txj2[jss::account] == alice.human());
BEAST_EXPECT(txj2[jss::fee_level] == "256"); BEAST_EXPECT(txj2[jss::fee_level] == "256");
BEAST_EXPECT(txj2["preflight_result"] == "tesSUCCESS"); BEAST_EXPECT(txj2["preflight_result"] == "tesSUCCESS");