mirror of
https://github.com/matrix-construct/construct
synced 2024-10-01 13:18:58 +02:00
modules/console: Use the loop eval overload rather than sorting here.
This commit is contained in:
parent
92761f5d9f
commit
d15df05966
1 changed files with 2 additions and 26 deletions
|
@ -11850,23 +11850,9 @@ console_cmd__fed__state(opt &out, const string_view &line)
|
||||||
vmopts.non_conform.set(m::event::conforms::MISSING_PREV_STATE);
|
vmopts.non_conform.set(m::event::conforms::MISSING_PREV_STATE);
|
||||||
m::vm::eval eval
|
m::vm::eval eval
|
||||||
{
|
{
|
||||||
vmopts
|
pdus, vmopts
|
||||||
};
|
};
|
||||||
|
|
||||||
std::vector<m::event> events;
|
|
||||||
events.reserve(size(pdus) + size(auth_chain));
|
|
||||||
|
|
||||||
for(const json::object &event : auth_chain)
|
|
||||||
events.emplace_back(event);
|
|
||||||
|
|
||||||
for(const json::object &event : pdus)
|
|
||||||
events.emplace_back(event);
|
|
||||||
|
|
||||||
std::sort(begin(events), end(events));
|
|
||||||
events.erase(std::unique(begin(events), end(events)), end(events));
|
|
||||||
for(const auto &event : events)
|
|
||||||
eval(event);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12017,19 +12003,9 @@ console_cmd__fed__backfill(opt &out, const string_view &line)
|
||||||
vmopts.node_id = string(rembuf, remote);
|
vmopts.node_id = string(rembuf, remote);
|
||||||
m::vm::eval eval
|
m::vm::eval eval
|
||||||
{
|
{
|
||||||
vmopts
|
pdus, vmopts
|
||||||
};
|
};
|
||||||
|
|
||||||
std::vector<m::event> events;
|
|
||||||
events.reserve(lex_cast<size_t>(count));
|
|
||||||
for(const json::object &event : pdus)
|
|
||||||
events.emplace_back(event);
|
|
||||||
|
|
||||||
std::sort(begin(events), end(events));
|
|
||||||
events.erase(std::unique(begin(events), end(events)), end(events));
|
|
||||||
for(const auto &event : events)
|
|
||||||
eval(event);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue