From 58f0866910fe4c96882b31c39dc4edeaafdede53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@ethereum.org>
Date: Wed, 6 Dec 2023 14:24:24 +0100
Subject: [PATCH] JournalBase

---
 test/state/state.hpp | 46 +++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/test/state/state.hpp b/test/state/state.hpp
index 1e8c2f140c..4b52e5db6b 100644
--- a/test/state/state.hpp
+++ b/test/state/state.hpp
@@ -15,52 +15,45 @@
 
 namespace evmone::state
 {
-struct JournalBalanceChange
+struct JournalBase
 {
     address addr;
-    intx::uint256 prev_balance;
 };
 
-struct JournalTouched
+struct JournalBalanceChange : JournalBase
 {
-    address addr;
+    intx::uint256 prev_balance;
 };
 
-struct JournalStorageChange
+struct JournalTouched : JournalBase
+{};
+
+struct JournalStorageChange : JournalBase
 {
-    address addr;
     bytes32 key;
     bytes32 prev_value;
     evmc_access_status prev_access_status;
 };
 
-struct JournalTransientStorageChange
+struct JournalTransientStorageChange : JournalBase
 {
-    address addr;
     bytes32 key;
     bytes32 prev_value;
 };
 
-struct JournalNonceBump
-{
-    address addr;
-};
+struct JournalNonceBump : JournalBase
+{};
 
-struct JournalCreate
+struct JournalCreate : JournalBase
 {
-    address addr;
     bool existed;
 };
 
-struct JournalDestruct
-{
-    address addr;
-};
+struct JournalDestruct : JournalBase
+{};
 
-struct JournalAccessAccount
-{
-    address addr;
-};
+struct JournalAccessAccount : JournalBase
+{};
 
 using JournalEntry =
     std::variant<JournalBalanceChange, JournalTouched, JournalStorageChange, JournalNonceBump,
@@ -125,25 +118,26 @@ class State
 
     void journal_balance_change(const address& addr, const intx::uint256& prev_balance)
     {
-        m_journal.emplace_back(JournalBalanceChange{addr, prev_balance});
+        m_journal.emplace_back(JournalBalanceChange{{addr}, prev_balance});
     }
 
     void journal_storage_change(const address& addr, const bytes32& key, const StorageValue& value)
     {
-        m_journal.emplace_back(JournalStorageChange{addr, key, value.current, value.access_status});
+        m_journal.emplace_back(
+            JournalStorageChange{{addr}, key, value.current, value.access_status});
     }
 
     void journal_transient_storage_change(
         const address& addr, const bytes32& key, const bytes32& value)
     {
-        m_journal.emplace_back(JournalTransientStorageChange{addr, key, value});
+        m_journal.emplace_back(JournalTransientStorageChange{{addr}, key, value});
     }
 
     void journal_bump_nonce(const address& addr) { m_journal.emplace_back(JournalNonceBump{addr}); }
 
     void journal_create(const address& addr, bool existed)
     {
-        m_journal.emplace_back(JournalCreate{addr, existed});
+        m_journal.emplace_back(JournalCreate{{addr}, existed});
     }
 
     void journal_destruct(const address& addr) { m_journal.emplace_back(JournalDestruct{addr}); }