ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2026-06-02 08:16:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-txq' into dev

Browse Source
This commit is contained in:
Richard Holland
2023-08-05 09:51:09 +00:00
parent 11b9a69f72 52e58ceade
commit b2ec73cdc5
1 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/test/app/TxQ_test.cpp
View File

@@ -1447,16 +1447,33 @@ public:
env.seq(elmo) + env.seq(fred) + env.seq(gwen) + env.seq(hank));
// These tests may change if TxQ ordering is changed
using namespace std::string_literals;
// std::cout << "aliceSeq: " << env.seq(alice) << "\n";
// std::cout << "aliceSeq= " << aliceSeq + 1 << "\n";
// std::cout << "bobSeq: " << env.seq(bob) << "\n";
// std::cout << "bobSeq= " << bobSeq << "\n";
// std::cout << "charlieSeq: " << env.seq(charlie) << "\n";
// std::cout << "charlieSeq= " << charlieSeq << "\n";
// std::cout << "dariaSeq: " << env.seq(daria) << "\n";
// std::cout << "dariaSeq= " << dariaSeq + 1 << "\n";
// std::cout << "elmoSeq: " << env.seq(elmo) << "\n";
// std::cout << "elmoSeq= " << elmoSeq + 1 << "\n";
// std::cout << "fredSeq: " << env.seq(fred) << "\n";
// std::cout << "fredSeq= " << fredSeq + 1 << "\n";
// std::cout << "gwenSeq: " << env.seq(gwen) << "\n";
// std::cout << "gwenSeq= " << gwenSeq + 1 << "\n";
// std::cout << "hankSeq: " << env.seq(hank) << "\n";
// std::cout << "hankSeq= " << hankSeq + 1 << "\n";
BEAST_EXPECTS(
aliceSeq == env.seq(alice),
aliceSeq + 1 == env.seq(alice),
"alice: "s + std::to_string(aliceSeq) + ", " +
std::to_string(env.seq(alice)));
BEAST_EXPECTS(
bobSeq + 1 == env.seq(bob),
bobSeq == env.seq(bob),
"bob: "s + std::to_string(bobSeq) + ", " +
std::to_string(env.seq(bob)));
BEAST_EXPECTS(
charlieSeq + 2 == env.seq(charlie),
charlieSeq == env.seq(charlie),
"charlie: "s + std::to_string(charlieSeq) + ", " +
std::to_string(env.seq(charlie)));
BEAST_EXPECTS(
@@ -1468,11 +1485,11 @@ public:
"elmo: "s + std::to_string(elmoSeq) + ", " +
std::to_string(env.seq(elmo)));
BEAST_EXPECTS(
fredSeq == env.seq(fred),
fredSeq + 1 == env.seq(fred),
"fred: "s + std::to_string(fredSeq) + ", " +
std::to_string(env.seq(fred)));
BEAST_EXPECTS(
gwenSeq == env.seq(gwen),
gwenSeq + 1 == env.seq(gwen),
"gwen: "s + std::to_string(gwenSeq) + ", " +
std::to_string(env.seq(gwen)));
BEAST_EXPECTS(
@@ -1482,15 +1499,23 @@ public:
// Which sequences get incremented may change if TxQ ordering is
// changed
//++aliceSeq;
++bobSeq;
++(++charlieSeq);
++aliceSeq;
// ++bobSeq;
// ++(++charlieSeq);
++dariaSeq;
++elmoSeq;
// ++fredSeq;
// ++gwenSeq;
++fredSeq;
++gwenSeq;
++hankSeq;
// std::cout << "bobSeq: " << ++bobSeq << "\n";
// std::cout << "charlieSeq: " << ++(++charlieSeq) << "\n";
// std::cout << "dariaSeq: " << ++dariaSeq << "\n";
// std::cout << "elmoSeq: " << ++elmoSeq << "\n";
// std::cout << "fredSeq: " << ++fredSeq << "\n";
// std::cout << "gwenSeq: " << ++gwenSeq << "\n";
// std::cout << "hankSeq: " << ++hankSeq << "\n";
auto getTxsQueued = [&]() {
auto const txs = env.app().getTxQ().getTxs();
std::map<AccountID, std::size_t> result;