Unused events have not been required for a long time

Author: swatanabe

doc/src/development/services/cpp-service/reference/services-events.md

@@ -66,7 +66,7 @@ auto result =
 
 ## Defining events
 
-To define events for a service, declare the event functions as below, then reflect them using the 2 macros below. Each of the `History` and `Merkle` structs must be present and reflected, even when they don't have any events declared within.
+To define events for a service, declare the event functions as below, then reflect them using the 2 macros below.
 
 After you have defined your events, use [psibase::Service::emit] to emit them and [psibase::Service::events] to read them.
 

packages/system/Transact/include/services/system/Transact.hpp

@@ -498,9 +498,6 @@ namespace SystemService
             /// Emitted at the start of each block
             void blockStart(psibase::BlockNum blockNum, psibase::BlockTime blockTime) {}
          };
-         struct Merkle
-         {
-         };
       };
    };
    PSIO_REFLECT(Transact,
@@ -533,7 +530,6 @@ namespace SystemService
    PSIBASE_REFLECT_TABLES(Transact, Transact::Tables)
    PSIBASE_REFLECT_HISTORY_EVENTS(Transact, method(blockStart, blockNum, blockTime));
    PSIBASE_PUBLIC_EVENT(Transact::Events::History::blockStart)
-   PSIBASE_REFLECT_MERKLE_EVENTS(Transact);
 
    // The status will never be nullopt during transaction execution or during RPC.
    // It will be nullopt when called by a test wasm before the genesis transaction

packages/user/Chainmail/include/services/user/Chainmail.hpp

@@ -44,7 +44,6 @@ namespace UserService
             void sent(psibase::AccountNumber sender, psibase::AccountNumber receiver, std::string subject, std::string body, psibase::TimePointSec datetime) {}
             void archive(std::string msg_id) {}
          };
-         struct Merkle{};
       };
       // clang-format on
    };
@@ -62,7 +61,6 @@ namespace UserService
       method(sent, sender, receiver, subject, body, datetime),
       method(archive, msg_id),
    );
-   PSIBASE_REFLECT_MERKLE_EVENTS(Chainmail);
    // clang-format on
 
 }  // namespace UserService

packages/user/Events/test/TestService.hpp

@@ -23,9 +23,6 @@ struct TestService : psibase::Service
          void account(psibase::AccountNumber a);
          void time(psibase::TimePointSec t);
       };
-      struct Merkle
-      {
-      };
    };
 };
 PSIO_REFLECT(TestService,
@@ -43,6 +40,5 @@ PSIBASE_REFLECT_HISTORY_EVENTS(TestService,
                                method(str, s),
                                method(account, a),
                                method(time, t));
-PSIBASE_REFLECT_MERKLE_EVENTS(TestService);
 
 PSIBASE_REFLECT_TABLES(TestService)

packages/user/Invite/include/services/user/Invite.hpp

@@ -102,7 +102,6 @@ namespace UserService
             {
                void updated(uint32_t inviteId, psibase::AccountNumber actor, std::string_view event);
             };
-            struct Merkle {};
          };
          // clang-format on
       };
@@ -121,7 +120,6 @@ namespace UserService
       PSIBASE_REFLECT_HISTORY_EVENTS(Invite,
          method(updated, inviteId, actor, event),
       );
-      PSIBASE_REFLECT_MERKLE_EVENTS(Invite);
       PSIBASE_REFLECT_TABLES(Invite, Invite::Tables)
       // clang-format on
    }  // namespace InviteNs

packages/user/Symbol/include/services/user/Symbol.hpp

@@ -49,7 +49,6 @@ namespace UserService
          {
             void symEvent(SID symbol, Account actor, uint8_t action) {}
          };
-         struct Merkle{};
       };
       // clang-format on
    };
@@ -73,7 +72,6 @@ namespace UserService
    PSIBASE_REFLECT_HISTORY_EVENTS(Symbol,
       method(symEvent, symbol, actor, action),
    );
-   PSIBASE_REFLECT_MERKLE_EVENTS(Symbol);
 
    PSIBASE_REFLECT_TABLES(Symbol, Symbol::Tables)
    // clang-format on

packages/user/Tokens/include/services/user/Tokens.hpp

@@ -361,8 +361,6 @@ namespace UserService
             void supplyChanged(TID tokenId, Account actor, std::string action, std::string amount, Memo memo) {}
             void balChanged(TID tokenId, Account account, Account counterParty, std::string action, std::string amount, Memo memo) {}
          };
-
-         struct Merkle{};
       };
       // clang-format on
    };
@@ -401,7 +399,6 @@ namespace UserService
       method(supplyChanged, tokenId, actor, action, amount, memo),
       method(balChanged, tokenId, account, counterParty, action, amount, memo),
    );
-   PSIBASE_REFLECT_MERKLE_EVENTS(Tokens);
    PSIBASE_REFLECT_TABLES(Tokens, Tokens::Tables)
    // clang-format on