ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove conditionals for featureEscrow enabled 31Mar2017

Browse Source
This commit is contained in:
Scott Schurr
2020-02-27 15:31:13 -08:00
parent e93a44fe9b
commit c8282795ef
5 changed files with 28 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/test/app/Escrow_test.cpp
View File

@@ -215,36 +215,25 @@ struct Escrow_test : public beast::unit_test::suite
using namespace jtx;
using namespace std::chrono;
{ // Escrow not enabled
Env env(*this, supported_amendments() - featureEscrow);
env.fund(XRP(5000), "alice", "bob");
env(escrow("alice", "bob", XRP(1000)),
finish_time(env.now() + 1s), ter(temDISABLED));
env(finish("bob", "alice", 1), ter(temDISABLED));
env(cancel("bob", "alice", 1), ter(temDISABLED));
}
Env env(*this);
env.fund(XRP(5000), "alice", "bob");
env(escrow("alice", "bob", XRP(1000)), finish_time(env.now() + 1s));
env.close();
{ // Escrow enabled
Env env(*this);
env.fund(XRP(5000), "alice", "bob");
env(escrow("alice", "bob", XRP(1000)), finish_time(env.now() + 1s));
env.close();
auto const seq1 = env.seq("alice");
auto const seq1 = env.seq("alice");
env(escrow("alice", "bob", XRP(1000)), condition (cb1),
finish_time(env.now() + 1s), fee(1500));
env.close();
env(finish("bob", "alice", seq1),
condition(cb1), fulfillment(fb1), fee(1500));
env(escrow("alice", "bob", XRP(1000)), condition (cb1),
finish_time(env.now() + 1s), fee(1500));
env.close();
env(finish("bob", "alice", seq1),
condition(cb1), fulfillment(fb1), fee(1500));
auto const seq2 = env.seq("alice");
auto const seq2 = env.seq("alice");
env(escrow("alice", "bob", XRP(1000)), condition(cb2),
finish_time(env.now() + 1s), cancel_time(env.now() + 2s), fee(1500));
env.close();
env(cancel("bob", "alice", seq2), fee(1500));
}
env(escrow("alice", "bob", XRP(1000)), condition(cb2),
finish_time(env.now() + 1s), cancel_time(env.now() + 2s), fee(1500));
env.close();
env(cancel("bob", "alice", seq2), fee(1500));
}
void