From e773fa8d79ed44dd6ced1a1c1c2ad3d6d0c7e67c Mon Sep 17 00:00:00 2001
From: clemahieu <clemahieu@gmail.com>
Date: Fri, 3 Mar 2023 02:29:39 +0000
Subject: [PATCH] Removing transaction from processed observer parameters.
 Change several usages of processed_batch to processed.

---
 nano/node/block_broadcast.cpp   | 19 ++++++++-----------
 nano/node/blocking_observer.cpp |  7 ++-----
 nano/node/blockprocessor.cpp    |  3 +--
 nano/node/blockprocessor.hpp    |  2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/nano/node/block_broadcast.cpp b/nano/node/block_broadcast.cpp
index 0bb28a268..31dc2ef2b 100644
--- a/nano/node/block_broadcast.cpp
+++ b/nano/node/block_broadcast.cpp
@@ -15,19 +15,16 @@ void nano::block_broadcast::connect (nano::block_processor & block_processor, bo
 	{
 		return;
 	}
-	block_processor.batch_processed.add ([this] (auto const & items) {
-		for (auto const & [result, block] : items)
+	block_processor.processed.add ([this] (auto const & result, auto const & block) {
+		switch (result.code)
 		{
-			switch (result.code)
-			{
-				case nano::process_result::progress:
-					observe (block);
-					break;
-				default:
-					break;
-			}
-			erase (block);
+			case nano::process_result::progress:
+				observe (block);
+				break;
+			default:
+				break;
 		}
+		erase (block);
 	});
 }
 
diff --git a/nano/node/blocking_observer.cpp b/nano/node/blocking_observer.cpp
index 8dab3f48c..809f0b11d 100644
--- a/nano/node/blocking_observer.cpp
+++ b/nano/node/blocking_observer.cpp
@@ -3,11 +3,8 @@
 
 void nano::blocking_observer::connect (nano::block_processor & block_processor)
 {
-	block_processor.batch_processed.add ([this] (auto const & items) {
-		for (auto const & [result, block] : items)
-		{
-			observe (result, block);
-		}
+	block_processor.processed.add ([this] (auto const & result, auto const & block) {
+		observe (result, block);
 	});
 }
 
diff --git a/nano/node/blockprocessor.cpp b/nano/node/blockprocessor.cpp
index 719e86292..fa603f258 100644
--- a/nano/node/blockprocessor.cpp
+++ b/nano/node/blockprocessor.cpp
@@ -33,11 +33,10 @@ nano::block_processor::block_processor (nano::node & node_a, nano::write_databas
 {
 	batch_processed.add ([this] (auto const & items) {
 		// For every batch item: notify the 'processed' observer.
-		auto tx = node.store.tx_begin_read ();
 		for (auto const & item : items)
 		{
 			auto const & [result, block] = item;
-			processed.notify (tx, result, *block);
+			processed.notify (result, block);
 		}
 	});
 	blocking.connect (*this);
diff --git a/nano/node/blockprocessor.hpp b/nano/node/blockprocessor.hpp
index 28beb38a1..d17c770ce 100644
--- a/nano/node/blockprocessor.hpp
+++ b/nano/node/blockprocessor.hpp
@@ -56,7 +56,7 @@ public:
 
 public: // Events
 	using processed_t = std::pair<nano::process_return, std::shared_ptr<nano::block>>;
-	nano::observer_set<nano::transaction const &, nano::process_return const &, nano::block const &> processed;
+	nano::observer_set<nano::process_return const &, std::shared_ptr<nano::block>> processed;
 
 	// The batch observer feeds the processed obsever
 	nano::observer_set<std::deque<processed_t> const &> batch_processed;