From 3bc9c571a03aefaff159bbdfcc0dcbdaaf91e3f6 Mon Sep 17 00:00:00 2001
From: gvolfing <gabor.volfinger@memgraph.io>
Date: Wed, 25 Jan 2023 07:02:03 +0100
Subject: [PATCH] Make the use RequestRouter more restricted

---
 src/query/v2/interpreter.hpp                |  5 ++++-
 src/query/v2/request_router.hpp             |  2 +-
 tests/simulation/simulation_interpreter.hpp | 10 +---------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/query/v2/interpreter.hpp b/src/query/v2/interpreter.hpp
index 9c2bef3d2..4bffba2fa 100644
--- a/src/query/v2/interpreter.hpp
+++ b/src/query/v2/interpreter.hpp
@@ -296,7 +296,10 @@ class Interpreter final {
    */
   void Abort();
 
-  RequestRouterInterface *GetRequestRouter() { return request_router_.get(); }
+  const RequestRouterInterface *GetRequestRouter() const { return request_router_.get(); }
+  void InstallSimulatorTicker(std::function<bool()> &&tick_simulator) {
+    request_router_->InstallSimulatorTicker(tick_simulator);
+  }
 
  private:
   struct QueryExecution {
diff --git a/src/query/v2/request_router.hpp b/src/query/v2/request_router.hpp
index 252278bb8..7ccb0a22b 100644
--- a/src/query/v2/request_router.hpp
+++ b/src/query/v2/request_router.hpp
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <algorithm>
-#include <boost/uuid/uuid.hpp>
 #include <chrono>
 #include <deque>
 #include <iostream>
@@ -28,6 +27,7 @@
 #include <variant>
 #include <vector>
 
+#include "boost/uuid/uuid.hpp"
 #include "coordinator/coordinator.hpp"
 #include "coordinator/coordinator_client.hpp"
 #include "coordinator/coordinator_rsm.hpp"
diff --git a/tests/simulation/simulation_interpreter.hpp b/tests/simulation/simulation_interpreter.hpp
index 497ee7103..e83980787 100644
--- a/tests/simulation/simulation_interpreter.hpp
+++ b/tests/simulation/simulation_interpreter.hpp
@@ -43,9 +43,7 @@ class SimulatedInterpreter {
   ~SimulatedInterpreter() = default;
 
   void InstallSimulatorTicker(Simulator &simulator) {
-    std::function<bool()> tick_simulator = simulator.GetSimulatorTickClosure();
-    auto *request_router = interpreter_->GetRequestRouter();
-    request_router->InstallSimulatorTicker(tick_simulator);
+    interpreter_->InstallSimulatorTicker(simulator.GetSimulatorTickClosure());
   }
 
   std::vector<ResultStream> RunQueries(const std::vector<std::string> &queries) {
@@ -65,14 +63,8 @@ class SimulatedInterpreter {
     std::map<std::string, memgraph::storage::v3::PropertyValue> params;
     const std::string *username = nullptr;
 
-    interpreter_->BeginTransaction();
-
-    auto *rr = interpreter_->GetRequestRouter();
-    rr->StartTransaction();
-
     interpreter_->Prepare(query, params, username);
     interpreter_->PullAll(&stream);
-    interpreter_->CommitTransaction();
 
     return stream;
   }