mirror of
https://github.com/XRPLF/rippled.git
synced 2026-04-29 15:37:57 +00:00
merge fixes
This commit is contained in:
@@ -92,7 +92,7 @@ struct HostFuncImpl_test : public beast::unit_test::suite
|
||||
|
||||
auto const result = hfs.getLedgerSqn();
|
||||
if (BEAST_EXPECT(result.has_value()))
|
||||
BEAST_EXPECT(result.value() == env.current()->info().seq);
|
||||
BEAST_EXPECT(result.value() == env.current()->header().seq);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -149,7 +149,7 @@ struct HostFuncImpl_test : public beast::unit_test::suite
|
||||
|
||||
auto const result = hfs.getParentLedgerHash();
|
||||
if (BEAST_EXPECT(result.has_value()))
|
||||
BEAST_EXPECT(result.value() == env.current()->info().parentHash);
|
||||
BEAST_EXPECT(result.value() == env.current()->header().parentHash);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -87,7 +87,7 @@ public:
|
||||
Expected<Hash, HostFunctionError>
|
||||
getParentLedgerHash() override
|
||||
{
|
||||
return env_.current()->info().parentHash;
|
||||
return env_.current()->header().parentHash;
|
||||
}
|
||||
|
||||
Expected<int32_t, HostFunctionError>
|
||||
@@ -284,7 +284,7 @@ public:
|
||||
Expected<Hash, HostFunctionError>
|
||||
computeSha512HalfHash(Slice const& data) override
|
||||
{
|
||||
return env_.current()->info().parentHash;
|
||||
return env_.current()->header().parentHash;
|
||||
}
|
||||
|
||||
Expected<Bytes, HostFunctionError>
|
||||
@@ -603,7 +603,7 @@ struct PerfHostFunctions : public TestHostFunctions
|
||||
Expected<Hash, HostFunctionError>
|
||||
getParentLedgerHash() override
|
||||
{
|
||||
return env_.current()->info().parentHash;
|
||||
return env_.current()->header().parentHash;
|
||||
}
|
||||
|
||||
Expected<int32_t, HostFunctionError>
|
||||
|
||||
@@ -32,7 +32,7 @@ WasmHostFunctionsImpl::getParentLedgerTime()
|
||||
Expected<Hash, HostFunctionError>
|
||||
WasmHostFunctionsImpl::getParentLedgerHash()
|
||||
{
|
||||
return ctx.view().info().parentHash;
|
||||
return ctx.view().header().parentHash;
|
||||
}
|
||||
|
||||
Expected<int32_t, HostFunctionError>
|
||||
|
||||
Reference in New Issue
Block a user