From e4d891abac2291b0ccc9f98efee9750684a10ed7 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sat, 10 Mar 2018 14:26:18 -0800 Subject: [PATCH] ircd::m: Remove duplicate exists(event_id) util. --- include/ircd/m/dbs.h | 3 --- ircd/m/dbs.cc | 16 ---------------- ircd/m/vm.cc | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/include/ircd/m/dbs.h b/include/ircd/m/dbs.h index 4cec9dbff..e766c1b26 100644 --- a/include/ircd/m/dbs.h +++ b/include/ircd/m/dbs.h @@ -47,9 +47,6 @@ namespace ircd::m::dbs string_view state_root(const mutable_buffer &out, const id::event &); string_view state_root(const mutable_buffer &out, const event &); - // [GET] Query suite - bool exists(const event::id &); - // [SET (txn)] Basic write suite string_view write(db::txn &, const event &, const write_opts &); } diff --git a/ircd/m/dbs.cc b/ircd/m/dbs.cc index 4e3f99348..866ae17cb 100644 --- a/ircd/m/dbs.cc +++ b/ircd/m/dbs.cc @@ -407,22 +407,6 @@ ircd::m::dbs::state_root(const mutable_buffer &out, return ret; } -bool -ircd::m::dbs::exists(const event::id &event_id) -{ - static constexpr auto idx - { - json::indexof() - }; - - auto &column - { - event_column.at(idx) - }; - - return has(column, event_id); -} - // // Database descriptors // diff --git a/ircd/m/vm.cc b/ircd/m/vm.cc index 27cf5eb13..69de7dff7 100644 --- a/ircd/m/vm.cc +++ b/ircd/m/vm.cc @@ -328,7 +328,7 @@ ircd::m::vm::_eval_pdu(eval &eval, for(size_t i(0); i < prev_count; ++i) { const auto prev_id{prev.prev_event(i)}; - if(opts.prev_check_exists && !dbs::exists(prev_id)) + if(opts.prev_check_exists && !exists(prev_id)) throw error { fault::EVENT, "Missing prev event %s", string_view{prev_id}