Update to latest graph-prototype

fair-acc · Feb 23, 2024 · d490abd · d490abd
1 parent 8b261c1
commit d490abd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,7 @@ set(ENABLE_TESTING OFF)
 FetchContent_Declare(
     graph-prototype
     GIT_REPOSITORY https://github.com/fair-acc/graph-prototype.git
-    GIT_TAG ed9738d809d4f89ddbbee49fd9a3bbd87c27bfab # main as of 2024-02-20
+    GIT_TAG 7f22e217e88ef54fe45ece84f804f6de8b7ff989 # main as of 2024-02-22
 )
 
 FetchContent_Declare(

diff --git a/blocklib/picoscope/test/qa_Picoscope4000a.cc b/blocklib/picoscope/test/qa_Picoscope4000a.cc
@@ -77,10 +77,10 @@ testStreamingBasics() {
     expect(nothrow([&ps] { ps.start(); }));
 
     scheduler::Simple<scheduler::ExecutionPolicy::multiThreaded> sched{ std::move(flowGraph) };
-    sched.init();
-    sched.start();
+    expect(sched.changeStateTo(lifecycle::State::INITIALISED).has_value());
+    expect(sched.changeStateTo(lifecycle::State::RUNNING).has_value());
     std::this_thread::sleep_for(kDuration);
-    sched.stop();
+    expect(sched.changeStateTo(lifecycle::State::REQUESTED_STOP).has_value());
 
     const auto measuredRate = static_cast<double>(sink.samples_seen) / duration<double>(kDuration).count();
     fmt::println("Produced in worker: {}", ps.producedWorker());
@@ -186,10 +186,10 @@ const boost::ut::suite Picoscope4000aTests = [] {
         expect(eq(ConnectionResult::SUCCESS, flowGraph.connect<"analog_out", 0>(ps).to<"in">(sink0)));
 
         scheduler::Simple<scheduler::ExecutionPolicy::multiThreaded> sched{ std::move(flowGraph) };
-        sched.init();
-        sched.start();
+        expect(sched.changeStateTo(lifecycle::State::INITIALISED).has_value());
+        expect(sched.changeStateTo(lifecycle::State::RUNNING).has_value());
         std::this_thread::sleep_for(std::chrono::seconds(3));
-        sched.stop();
+        expect(sched.changeStateTo(lifecycle::State::REQUESTED_STOP).has_value());
 
         expect(ge(sink0.samples_seen, std::size_t{ 2000 }));
         expect(le(sink0.samples_seen, std::size_t{ 10000 }));