commit 0767662faa31c078ec0e0383d3fd2ff6ed18b388
author Austin Schuh <austin.linux@gmail.com> Thu Jan 21 18:59:17 2021 -0800
committer Austin Schuh <austin.linux@gmail.com> Thu Jan 21 19:09:29 2021 -0800
tree 1edc818bc8c5fa59f3c562c4eb70fe473b9ad5d4
parent 7ae48d2224d3fd4a147fc2f042e3d5615e977d00

Switch LogReader::Nodes to LoggedNodes

If folks want a list of nodes from the simulated config, they should
instead use the factory configuration.  Most of the time, we want to
instead use the nodes from the logged configuration.  Flip everything
over.

We should probably consider removing the helper since it doesn't really
add much.

Change-Id: I8f2150df9c50acfc0d7444f42b37820516fe072f

aos/events/logging/logger_test.cc

diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index a28891e..5f18e29 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -96,7 +96,7 @@
   // log file.
   reader.Register();
 
-  EXPECT_THAT(reader.Nodes(), ::testing::ElementsAre(nullptr));
+  EXPECT_THAT(reader.LoggedNodes(), ::testing::ElementsAre(nullptr));
 
   std::unique_ptr<EventLoop> test_event_loop =
       reader.event_loop_factory()->MakeEventLoop("log_reader");
@@ -237,7 +237,7 @@
     LogReader reader(std::get<0>(logfile));
     reader.Register();
 
-    EXPECT_THAT(reader.Nodes(), ::testing::ElementsAre(nullptr));
+    EXPECT_THAT(reader.LoggedNodes(), ::testing::ElementsAre(nullptr));
 
     std::unique_ptr<EventLoop> test_event_loop =
         reader.event_loop_factory()->MakeEventLoop("log_reader");
@@ -322,7 +322,7 @@
   // log file.
   reader.Register();
 
-  EXPECT_THAT(reader.Nodes(), ::testing::ElementsAre(nullptr));
+  EXPECT_THAT(reader.LoggedNodes(), ::testing::ElementsAre(nullptr));
 
   std::unique_ptr<EventLoop> test_event_loop =
       reader.event_loop_factory()->MakeEventLoop("log_reader");
@@ -943,7 +943,10 @@
   LOG(INFO) << "now pi2 "
             << log_reader_factory.GetNodeEventLoopFactory(pi2)->monotonic_now();
 
-  EXPECT_THAT(reader.Nodes(), ::testing::ElementsAre(pi1, pi2));
+  EXPECT_THAT(reader.LoggedNodes(),
+              ::testing::ElementsAre(
+                  configuration::GetNode(reader.logged_configuration(), pi1),
+                  configuration::GetNode(reader.logged_configuration(), pi2)));
 
   reader.event_loop_factory()->set_send_delay(chrono::microseconds(0));
 
@@ -1137,7 +1140,10 @@
   const Node *pi2 =
       configuration::GetNode(log_reader_factory.configuration(), "pi2");
 
-  EXPECT_THAT(reader.Nodes(), ::testing::ElementsAre(pi1, pi2));
+  EXPECT_THAT(reader.LoggedNodes(),
+              ::testing::ElementsAre(
+                  configuration::GetNode(reader.logged_configuration(), pi1),
+                  configuration::GetNode(reader.logged_configuration(), pi2)));
 
   reader.event_loop_factory()->set_send_delay(chrono::microseconds(0));
 
@@ -1313,7 +1319,10 @@
             << " "
             << log_reader_factory.GetNodeEventLoopFactory(pi2)->realtime_now();
 
-  EXPECT_THAT(reader.Nodes(), ::testing::ElementsAre(pi1, pi2));
+  EXPECT_THAT(reader.LoggedNodes(),
+              ::testing::ElementsAre(
+                  configuration::GetNode(reader.logged_configuration(), pi1),
+                  configuration::GetNode(reader.logged_configuration(), pi2)));
 
   reader.event_loop_factory()->set_send_delay(chrono::microseconds(0));
 
@@ -1594,7 +1603,10 @@
   LOG(INFO) << "now pi2 "
             << log_reader_factory.GetNodeEventLoopFactory(pi2)->monotonic_now();
 
-  EXPECT_THAT(reader.Nodes(), ::testing::ElementsAre(pi1, pi2));
+  EXPECT_THAT(reader.LoggedNodes(),
+              ::testing::ElementsAre(
+                  configuration::GetNode(reader.logged_configuration(), pi1),
+                  configuration::GetNode(reader.logged_configuration(), pi2)));
 
   reader.event_loop_factory()->set_send_delay(chrono::microseconds(0));