Skip to content

Commit e75ca2d

Browse files
oleks-ripoleks-rip
committed
Move logs to ApplyView
1 parent 650b629 commit e75ca2d

File tree

1 file changed

+44
-49
lines changed

1 file changed

+44
-49
lines changed

‎src/test/app/HostFuncImpl_test.cpp‎

Lines changed: 44 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,23 @@ static ApplyContext
6262
createApplyContext(
6363
test::jtx::Env& env,
6464
OpenView& ov,
65+
beast::Journal j,
6566
STTx const& tx = STTx(ttESCROW_FINISH, [](STObject&) {}))
6667
{
6768
ApplyContext ac{
68-
env.app(),
69-
ov,
70-
tx,
71-
tesSUCCESS,
72-
env.current()->fees().base,
73-
tapNONE,
74-
env.journal};
69+
env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, tapNONE, j};
7570
return ac;
7671
}
7772

73+
static ApplyContext
74+
createApplyContext(
75+
test::jtx::Env& env,
76+
OpenView& ov,
77+
STTx const& tx = STTx(ttESCROW_FINISH, [](STObject&) {}))
78+
{
79+
return createApplyContext(env, ov, env.journal, tx);
80+
}
81+
7882
struct HostFuncImpl_test : public beast::unit_test::suite
7983
{
8084
void
@@ -1906,22 +1910,6 @@ struct HostFuncImpl_test : public beast::unit_test::suite
19061910
}
19071911
}
19081912

1909-
class SuiteLogs2 : public Logs
1910-
{
1911-
public:
1912-
explicit SuiteLogs2(beast::unit_test::suite&)
1913-
: Logs(beast::severities::kError)
1914-
{
1915-
}
1916-
~SuiteLogs2() override = default;
1917-
std::unique_ptr<beast::Journal::Sink>
1918-
makeSink(std::string const&, beast::severities::Severity threshold)
1919-
override
1920-
{
1921-
return std::make_unique<StreamSink>(threshold);
1922-
}
1923-
};
1924-
19251913
void
19261914
testTrace()
19271915
{
@@ -1951,11 +1939,11 @@ struct HostFuncImpl_test : public beast::unit_test::suite
19511939

19521940
{
19531941
// logs disabled (trace < error)
1954-
auto logs = std::make_unique<SuiteLogs2>(*this);
1955-
Env env(
1956-
*this, envconfig(), std::move(logs), beast::severities::kError);
1942+
Env env(*this);
19571943
OpenView ov{*env.current()};
1958-
ApplyContext ac = createApplyContext(env, ov);
1944+
test::StreamSink sink{beast::severities::kError};
1945+
beast::Journal jlog{sink};
1946+
ApplyContext ac = createApplyContext(env, ov, jlog);
19591947

19601948
auto const dummyEscrow =
19611949
keylet::escrow(env.master, env.seq(env.master));
@@ -1966,6 +1954,8 @@ struct HostFuncImpl_test : public beast::unit_test::suite
19661954
auto const slice = Slice(data.data(), data.size());
19671955
auto const result = hfs.trace(msg, slice, false);
19681956
BEAST_EXPECT(result && *result == msg.size() + data.size());
1957+
auto const messages = sink.messages().str();
1958+
BEAST_EXPECT(messages.empty());
19691959
}
19701960
}
19711961

@@ -1993,11 +1983,11 @@ struct HostFuncImpl_test : public beast::unit_test::suite
19931983

19941984
{
19951985
// logs disabled
1996-
auto logs = std::make_unique<SuiteLogs2>(*this);
1997-
Env env(
1998-
*this, envconfig(), std::move(logs), beast::severities::kError);
1986+
Env env(*this);
19991987
OpenView ov{*env.current()};
2000-
ApplyContext ac = createApplyContext(env, ov);
1988+
test::StreamSink sink{beast::severities::kError};
1989+
beast::Journal jlog{sink};
1990+
ApplyContext ac = createApplyContext(env, ov, jlog);
20011991

20021992
auto const dummyEscrow =
20031993
keylet::escrow(env.master, env.seq(env.master));
@@ -2007,6 +1997,8 @@ struct HostFuncImpl_test : public beast::unit_test::suite
20071997
int64_t num = 123456789;
20081998
auto const result = hfs.traceNum(msg, num);
20091999
BEAST_EXPECT(result && *result == msg.size() + sizeof(int64_t));
2000+
auto const messages = sink.messages().str();
2001+
BEAST_EXPECT(messages.empty());
20102002
}
20112003
}
20122004

@@ -2037,11 +2029,11 @@ struct HostFuncImpl_test : public beast::unit_test::suite
20372029

20382030
{
20392031
// logs disabled
2040-
auto logs = std::make_unique<SuiteLogs2>(*this);
2041-
Env env(
2042-
*this, envconfig(), std::move(logs), beast::severities::kError);
2032+
Env env(*this);
20432033
OpenView ov{*env.current()};
2044-
ApplyContext ac = createApplyContext(env, ov);
2034+
test::StreamSink sink{beast::severities::kError};
2035+
beast::Journal jlog{sink};
2036+
ApplyContext ac = createApplyContext(env, ov, jlog);
20452037

20462038
auto const dummyEscrow =
20472039
keylet::escrow(env.master, env.seq(env.master));
@@ -2050,6 +2042,8 @@ struct HostFuncImpl_test : public beast::unit_test::suite
20502042
auto const result = hfs.traceAccount(msg, env.master.id());
20512043
BEAST_EXPECT(
20522044
result && *result == msg.size() + env.master.id().size());
2045+
auto const messages = sink.messages().str();
2046+
BEAST_EXPECT(messages.empty());
20532047
}
20542048
}
20552049

@@ -2100,11 +2094,11 @@ struct HostFuncImpl_test : public beast::unit_test::suite
21002094

21012095
{
21022096
// logs disabled
2103-
auto logs = std::make_unique<SuiteLogs2>(*this);
2104-
Env env(
2105-
*this, envconfig(), std::move(logs), beast::severities::kError);
2097+
Env env(*this);
21062098
OpenView ov{*env.current()};
2107-
ApplyContext ac = createApplyContext(env, ov);
2099+
test::StreamSink sink{beast::severities::kError};
2100+
beast::Journal jlog{sink};
2101+
ApplyContext ac = createApplyContext(env, ov, jlog);
21082102

21092103
auto const dummyEscrow =
21102104
keylet::escrow(env.master, env.seq(env.master));
@@ -2114,6 +2108,8 @@ struct HostFuncImpl_test : public beast::unit_test::suite
21142108
STAmount amount = XRP(12345);
21152109
auto const result = hfs.traceAmount(msg, amount);
21162110
BEAST_EXPECT(result && *result == msg.size());
2111+
auto const messages = sink.messages().str();
2112+
BEAST_EXPECT(messages.empty());
21172113
}
21182114
}
21192115

@@ -2176,24 +2172,23 @@ struct HostFuncImpl_test : public beast::unit_test::suite
21762172

21772173
{
21782174
// logs disabled
2179-
auto logs = std::make_unique<SuiteLogs2>(*this);
2180-
Env env(
2181-
*this, envconfig(), std::move(logs), beast::severities::kError);
2175+
Env env(*this);
21822176
OpenView ov{*env.current()};
2183-
ApplyContext ac = createApplyContext(env, ov);
2177+
test::StreamSink sink{beast::severities::kError};
2178+
beast::Journal jlog{sink};
2179+
ApplyContext ac = createApplyContext(env, ov, jlog);
21842180

21852181
auto const dummyEscrow =
21862182
keylet::escrow(env.master, env.seq(env.master));
21872183
WasmHostFunctionsImpl hfs(ac, dummyEscrow);
21882184

21892185
std::string msg = "trace float";
21902186

2191-
{
2192-
auto const result = hfs.traceFloat(msg, makeSlice(invalid));
2193-
BEAST_EXPECT(
2194-
result &&
2195-
*result == msg.size() + makeSlice(invalid).size());
2196-
}
2187+
auto const result = hfs.traceFloat(msg, makeSlice(invalid));
2188+
BEAST_EXPECT(
2189+
result && *result == msg.size() + makeSlice(invalid).size());
2190+
auto const messages = sink.messages().str();
2191+
BEAST_EXPECT(messages.empty());
21972192
}
21982193
}
21992194

0 commit comments

Comments
 (0)