ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use jtx::offer_cancel more places:

Browse Source 
Replace explicit construction of OfferCancel transactions in unit
tests with calls to jtx::offer_cancel().
This commit is contained in:
Scott Schurr
2021-04-13 15:43:38 -07:00
committed by manojsdoshi
parent 7822a28c87
commit ff3d2e7c29
6 changed files with 15 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/app/AccountTxPaging_test.cpp
View File

@@ -584,13 +584,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
txns.emplace_back(env.tx());
env.close();
{
Json::Value cancelOffer;
cancelOffer[jss::Account] = alice.human();
cancelOffer[jss::OfferSequence] = offerSeq;
cancelOffer[jss::TransactionType] = jss::OfferCancel;
env(cancelOffer, sig(alie));
}
env(offer_cancel(alice, offerSeq), sig(alie));
env.close();
txns.emplace_back(env.tx());

6
src/test/app/MultiSign_test.cpp
View File

@@ -1026,11 +1026,7 @@ public:
// Now multisign a ttOFFER_CANCEL canceling the offer we just created.
{
aliceSeq = env.seq(alice);
Json::Value cancelOffer;
cancelOffer[jss::Account] = alice.human();
cancelOffer[jss::OfferSequence] = offerSeq;
cancelOffer[jss::TransactionType] = jss::OfferCancel;
env(cancelOffer,
env(offer_cancel(alice, offerSeq),
seq(aliceSeq),
msig(becky, bogie),
fee(3 * baseFee));

37
src/test/app/Offer_test.cpp
View File

@@ -223,13 +223,7 @@ public:
env.close();
BEAST_EXPECT(isOffer(env, alice, XRP(222), USD(111)));
{
Json::Value cancelOffer;
cancelOffer[jss::Account] = alice.human();
cancelOffer[jss::OfferSequence] = offer4Seq;
cancelOffer[jss::TransactionType] = jss::OfferCancel;
env(cancelOffer);
}
env(offer_cancel(alice, offer4Seq));
env.close();
BEAST_EXPECT(env.seq(alice) == offer4Seq + 2);
@@ -1382,13 +1376,9 @@ public:
}
// cancel that lingering second offer so that it doesn't interfere
// with the next set of offers we test. this will not be needed once
// with the next set of offers we test. This will not be needed once
// the bridging bug is fixed
Json::Value cancelOffer;
cancelOffer[jss::Account] = account_to_test.human();
cancelOffer[jss::OfferSequence] = secondLegSeq;
cancelOffer[jss::TransactionType] = jss::OfferCancel;
env(cancelOffer);
env(offer_cancel(account_to_test, secondLegSeq));
env.require(offers(account_to_test, 0));
// PART 2:
@@ -1611,11 +1601,7 @@ public:
env(offer(env.master, XRP(500), USD(100)));
env.close();
Json::Value cancelOffer;
cancelOffer[jss::Account] = env.master.human();
cancelOffer[jss::OfferSequence] = nextOfferSeq;
cancelOffer[jss::TransactionType] = jss::OfferCancel;
env(cancelOffer);
env(offer_cancel(env.master, nextOfferSeq));
BEAST_EXPECT(env.seq(env.master) == nextOfferSeq + 2);
// ledger_accept, call twice and verify no odd behavior
@@ -1638,20 +1624,15 @@ public:
auto const nextOfferSeq = env.seq(env.master);
env.fund(XRP(10000), alice);
Json::Value cancelOffer;
cancelOffer[jss::Account] = env.master.human();
cancelOffer[jss::OfferSequence] = nextOfferSeq;
cancelOffer[jss::TransactionType] = jss::OfferCancel;
env(cancelOffer);
env(offer_cancel(env.master, nextOfferSeq));
cancelOffer[jss::OfferSequence] = env.seq(env.master);
env(cancelOffer, ter(temBAD_SEQUENCE));
env(offer_cancel(env.master, env.seq(env.master)),
ter(temBAD_SEQUENCE));
cancelOffer[jss::OfferSequence] = env.seq(env.master) + 1;
env(cancelOffer, ter(temBAD_SEQUENCE));
env(offer_cancel(env.master, env.seq(env.master) + 1),
ter(temBAD_SEQUENCE));
env.close();
env.close();
}
void

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

@@ -2308,11 +2308,7 @@ public:
env.memoize("bob");
env.memoize("carol");
{
Json::Value cancelOffer;
cancelOffer[jss::Account] = alice.human();
cancelOffer[jss::OfferSequence] = 3;
cancelOffer[jss::TransactionType] = jss::OfferCancel;
auto const jtx = env.jt(cancelOffer, seq(5), fee(10));
auto const jtx = env.jt(offer_cancel(alice, 3), seq(5), fee(10));
auto const pf = preflight(
env.app(),
env.current()->rules(),

8
src/test/ledger/Directory_test.cpp
View File

@@ -279,12 +279,8 @@ struct Directory_test : public beast::unit_test::suite
{
for (int i = 0; i < dirNodeMaxEntries; ++i)
{
Json::Value cancelOffer;
cancelOffer[jss::Account] = alice.human();
cancelOffer[jss::OfferSequence] =
Json::UInt(firstOfferSeq + page * dirNodeMaxEntries + i);
cancelOffer[jss::TransactionType] = jss::OfferCancel;
env(cancelOffer);
env(offer_cancel(
alice, firstOfferSeq + page * dirNodeMaxEntries + i));
env.close();
}
}

8
src/test/rpc/AccountTx_test.cpp
View File

@@ -277,13 +277,7 @@ class AccountTx_test : public beast::unit_test::suite
env(offer(alice, USD(50), XRP(150)), sig(alie));
env.close();
{
Json::Value cancelOffer;
cancelOffer[jss::Account] = alice.human();
cancelOffer[jss::OfferSequence] = offerSeq;
cancelOffer[jss::TransactionType] = jss::OfferCancel;
env(cancelOffer, sig(alie));
}
env(offer_cancel(alice, offerSeq), sig(alie));
env.close();
// SignerListSet