ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-07-31 19:10:25 +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

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

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