From 7c1cc2e1d1189050150259281d3fba48aecf3c3c Mon Sep 17 00:00:00 2001 From: Richard Holland Date: Mon, 16 Jan 2023 10:22:20 +0000 Subject: [PATCH] fix up some test cases, turn off wasmedge logging --- src/ripple/app/hook/applyHook.h | 2 ++ src/test/app/Escrow_test.cpp | 1 + src/test/app/NFToken_test.cpp | 27 ++++++++++++++++++--------- src/test/app/SetHook_test.cpp | 2 ++ src/test/rpc/AccountSet_test.cpp | 3 ++- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/ripple/app/hook/applyHook.h b/src/ripple/app/hook/applyHook.h index dbf2d0316..24276f6bb 100644 --- a/src/ripple/app/hook/applyHook.h +++ b/src/ripple/app/hook/applyHook.h @@ -474,6 +474,8 @@ namespace hook JLOG(j.trace()) << "HookInfo[" << HC_ACC() << "]: creating wasm instance"; + WasmEdge_LogOff(); + WasmEdge_ConfigureContext* confCtx = WasmEdge_ConfigureCreate(); WasmEdge_ConfigureStatisticsSetInstructionCounting(confCtx, true); WasmEdge_VMContext* vmCtx = WasmEdge_VMCreate(confCtx, NULL); diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp index a5b20bbce..bd5459316 100644 --- a/src/test/app/Escrow_test.cpp +++ b/src/test/app/Escrow_test.cpp @@ -1963,6 +1963,7 @@ struct Escrow_test : public beast::unit_test::suite fee(1500)); env.close(); env(finish(carol, alice, seq1), fee(1500)); + env.close(); BEAST_EXPECT(env.balance(bob).value() == USD(5100)); env.close(); diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp index d613517f0..5033a8bce 100644 --- a/src/test/app/NFToken_test.cpp +++ b/src/test/app/NFToken_test.cpp @@ -532,7 +532,7 @@ class NFToken_test : public beast::unit_test::suite ter(temBAD_FEE)); // Set an invalid flag. - env(token::mint(alice, 0u), txflags(0x00008000), ter(temINVALID_FLAG)); + env(token::mint(alice, 0u), txflags(0x00010000), ter(temINVALID_FLAG)); // Can't set a transfer fee if the NFT does not have the tfTRANSFERABLE // flag set. @@ -614,7 +614,7 @@ class NFToken_test : public beast::unit_test::suite // Set an invalid flag. env(token::burn(alice, nftAlice0ID), - txflags(0x00008000), + txflags(0x00010000), ter(temINVALID_FLAG)); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == 0); @@ -641,7 +641,8 @@ class NFToken_test : public beast::unit_test::suite using namespace test::jtx; - Env env{*this, features}; + //Env env{*this, features}; + Env env{*this, features}; //envconfig(), features, nullptr, beast::severities::kTrace}; Account const alice{"alice"}; Account const buyer{"buyer"}; Account const gw("gw"); @@ -697,7 +698,7 @@ class NFToken_test : public beast::unit_test::suite // Set an invalid flag. env(token::createOffer(buyer, nftAlice0ID, XRP(1000)), - txflags(0x00008000), + txflags(0x00010000), ter(temINVALID_FLAG)); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == 0); @@ -928,7 +929,7 @@ class NFToken_test : public beast::unit_test::suite // Set an invalid flag. env(token::cancelOffer(buyer, {buyerOfferIndex}), - txflags(0x00008000), + txflags(0x00010000), ter(temINVALID_FLAG)); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == 1); @@ -962,7 +963,8 @@ class NFToken_test : public beast::unit_test::suite env(token::cancelOffer(buyer), ter(temMALFORMED)); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == 1); - + + #define M(m) memo(m, "", "") //---------------------------------------------------------------------- // preclaim @@ -980,8 +982,12 @@ class NFToken_test : public beast::unit_test::suite auto const gwCheckId = keylet::check(gw, env.seq(gw)).key; env(check::create(gw, env.master, XRP(300))); env.close(); + env.close(); - env(token::cancelOffer(gw, {gwCheckId}), ter(tecNO_PERMISSION)); + auto check = env.le(Keylet { ltCHECK, gwCheckId }); + BEAST_EXPECT(!!check); + + env(token::cancelOffer(gw, {gwCheckId}), M("here1"), ter(tecNO_PERMISSION)); env.close(); // Cancel the check so it doesn't mess up later tests. @@ -990,7 +996,7 @@ class NFToken_test : public beast::unit_test::suite } // gw attempts to cancel an offer they don't have permission to cancel. - env(token::cancelOffer(gw, {buyerOfferIndex}), ter(tecNO_PERMISSION)); + env(token::cancelOffer(gw, {buyerOfferIndex}), M("here2"), ter(tecNO_PERMISSION)); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == 1); @@ -1002,6 +1008,8 @@ class NFToken_test : public beast::unit_test::suite env(token::cancelOffer(buyer, {buyerOfferIndex})); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == 0); + env.close(); + } void @@ -1088,7 +1096,7 @@ class NFToken_test : public beast::unit_test::suite // Set an invalid flag. env(token::acceptSellOffer(buyer, noXferOfferIndex), - txflags(0x00008000), + txflags(0x00010000), ter(temINVALID_FLAG)); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == 0); @@ -3616,6 +3624,7 @@ class NFToken_test : public beast::unit_test::suite // The offer has not expired yet, so becky can't cancel it now. BEAST_EXPECT(ownerCount(env, alice) == 2); + env(token::cancelOffer(becky, {expiredOfferIndex}), ter(tecNO_PERMISSION)); env.close(); diff --git a/src/test/app/SetHook_test.cpp b/src/test/app/SetHook_test.cpp index a423acbb5..3a2faa049 100644 --- a/src/test/app/SetHook_test.cpp +++ b/src/test/app/SetHook_test.cpp @@ -26,6 +26,8 @@ #include #include +// RH TODO: test collect calls / weak tsh + namespace ripple { namespace test { diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp index b3ca4c9f0..eb95021ed 100644 --- a/src/test/rpc/AccountSet_test.cpp +++ b/src/test/rpc/AccountSet_test.cpp @@ -87,7 +87,8 @@ public: if (flag == asfDisallowIncomingCheck || flag == asfDisallowIncomingPayChan || flag == asfDisallowIncomingNFTOffer || - flag == asfDisallowIncomingTrustline) + flag == asfDisallowIncomingTrustline || + flag == asfTshCollect) { // These flags are part of the DisallowIncoming amendment // and are tested elsewhere