ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-23 20:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup fix1449

Browse Source
This commit is contained in:
seelabs
2017-03-31 11:19:01 -04:00
committed by Nik Bougalis
parent 3bd9772c04
commit 068889e5b1
2 changed files with 68 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ripple/app/paths/impl/DirectStep.cpp
View File

@@ -595,7 +595,6 @@ TER DirectStepI::check (StrandContext const& ctx) const
return temBAD_PATH; return temBAD_PATH;
} }
auto sleLine = ctx.view.read (keylet::line (src_, dst_, currency_));
{ {
auto sleSrc = ctx.view.read (keylet::account (src_)); auto sleSrc = ctx.view.read (keylet::account (src_));
if (!sleSrc) if (!sleSrc)
@@ -606,6 +605,8 @@ TER DirectStepI::check (StrandContext const& ctx) const
return terNO_ACCOUNT; return terNO_ACCOUNT;
} }
auto const sleLine = ctx.view.read (keylet::line (src_, dst_, currency_));
if (!sleLine) if (!sleLine)
{ {
JLOG (j_.trace()) << "DirectStepI: No credit line. " << *this; JLOG (j_.trace()) << "DirectStepI: No credit line. " << *this;
@@ -623,22 +624,21 @@ TER DirectStepI::check (StrandContext const& ctx) const
<< " src: " << src_; << " src: " << src_;
return terNO_AUTH; return terNO_AUTH;
} }
}
// pure issue/redeem can't be frozen // pure issue/redeem can't be frozen
if (! (ctx.isLast && ctx.isFirst)) if (!(ctx.isLast && ctx.isFirst))
{ {
auto const ter = checkFreeze (ctx.view, src_, dst_, currency_); auto const ter = checkFreeze(ctx.view, src_, dst_, currency_);
if (ter != tesSUCCESS) if (ter != tesSUCCESS)
return ter; return ter;
} }
if (ctx.prevStep) if (ctx.prevStep)
{ {
if (auto prevSrc = ctx.prevStep->directStepSrcAcct ()) if (auto prevSrc = ctx.prevStep->directStepSrcAcct())
{ {
auto const ter = auto const ter = checkNoRipple(
checkNoRipple (ctx.view, *prevSrc, src_, dst_, currency_, j_); ctx.view, *prevSrc, src_, dst_, currency_, j_);
if (ter != tesSUCCESS) if (ter != tesSUCCESS)
return ter; return ter;
} }
@@ -655,6 +655,8 @@ TER DirectStepI::check (StrandContext const& ctx) const
} }
} }
} }
}
{ {
Issue const srcIssue{currency_, src_}; Issue const srcIssue{currency_, src_};

44
src/test/app/Flow_test.cpp
View File

@@ -1157,11 +1157,55 @@ struct Flow_test : public beast::unit_test::suite
pass(); pass();
} }
void
testRIPD1449(bool withFix)
{
testcase("ripd1449");
using namespace jtx;
Env env(*this, features(featureFlow));
auto const timeDelta = env.closed ()->info ().closeTimeResolution;
auto const d = withFix ? timeDelta*100 : -timeDelta*100;
auto closeTime = fix1449Time() + d;
env.close(closeTime);
// pay alice -> xrp -> USD/bob -> bob -> gw -> alice
// set no ripple on bob's side of the bob/gw trust line
// carol has the bob/USD and makes an offer, bob has USD/gw
auto const alice = Account("alice");
auto const bob = Account("bob");
auto const carol = Account("carol");
auto const gw = Account("gw");
auto const USD = gw["USD"];
env.fund(XRP(100000000), alice, bob, carol, gw);
env.trust(USD(10000), alice, carol);
env(trust(bob, USD(10000), tfSetNoRipple));
env.trust(USD(10000), bob);
env.trust(bob["USD"](10000), carol);
env.close();
env(pay(bob, carol, bob["USD"](1000)));
env(pay(gw, bob, USD(1000)));
env.close();
env(offer(carol, XRP(1), bob["USD"](1000)));
env.close();
env(pay(alice, alice, USD(1000)), path(~bob["USD"], bob, gw),
sendmax(XRP(1)), txflags(tfNoRippleDirect),
ter(withFix ? tecPATH_DRY : tesSUCCESS));
env.close();
}
void run() override void run() override
{ {
testLimitQuality(); testLimitQuality();
testRIPD1443(true); testRIPD1443(true);
testRIPD1443(false); testRIPD1443(false);
testRIPD1449(true);
testRIPD1449(false);
auto testWithFeats = [this](auto&&... fs) auto testWithFeats = [this](auto&&... fs)
{ {