Merge pull request #1985 from gofractally/cleanup-event-macros

Remove unused event boilerplate

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 3 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.
 
@@ -91,8 +91,6 @@ struct MyService: psibase::Service<MyService> {
    };
 };
 
-PSIBASE_REFLECT_EVENTS(MyService)
-
 PSIBASE_REFLECT_HISTORY_EVENTS(
    MyService,
    method(myEvent, a, s),

libraries/psibase/common/include/psibase/Service.hpp

@@ -179,10 +179,6 @@ namespace psibase
    };  // Service
 };  // namespace psibase
 
-#define PSIBASE_REFLECT_EVENTS(SERVICE)       \
-   using SERVICE##_Events = SERVICE ::Events; \
-   PSIO_REFLECT(SERVICE##_Events)
-
 #define PSIBASE_REFLECT_HISTORY_EVENTS(SERVICE, ...)          \
    using SERVICE##_EventsHistory = SERVICE ::Events::History; \
    PSIO_REFLECT(SERVICE##_EventsHistory, __VA_ARGS__)

packages/psibase_tests/include/services/test/EmitEvents.hpp

@@ -52,7 +52,6 @@ namespace TestService
                 method(emitExample, r),
                 method(serveSys, request))
 
-   PSIBASE_REFLECT_EVENTS(EmitEvents)
    PSIBASE_REFLECT_HISTORY_EVENTS(EmitEvents,  //
                                   method(e, s, i),
                                   method(e2, r))

packages/system/StagedTx/service/cpp/include/services/system/StagedTx.hpp

@@ -118,7 +118,6 @@ namespace SystemService
       method(execute, id, txid),
       method(get_staged_tx, id),
    );
-   PSIBASE_REFLECT_EVENTS(StagedTxService);
    PSIBASE_REFLECT_HISTORY_EVENTS(StagedTxService,
       method(updated, txid, actor, datetime, event_type),
    );

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,
@@ -531,10 +528,8 @@ namespace SystemService
    )
 
    PSIBASE_REFLECT_TABLES(Transact, Transact::Tables)
-   PSIBASE_REFLECT_EVENTS(Transact);
    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/system/VirtualServer/service/cpp/include/services/system/VirtualServer.hpp

@@ -450,7 +450,6 @@ namespace SystemService
                 method(setBillableAcc, account),
                 method(serveSys, request, socket, user))
 
-   PSIBASE_REFLECT_EVENTS(VirtualServer);
    PSIBASE_REFLECT_HISTORY_EVENTS(
        VirtualServer,
        allowHashedMethods(),

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
    };
@@ -58,12 +57,10 @@ namespace UserService
       method(unsave, msg_id, sender, subject, body, datetime),
       method(serveSys, request)
    );
-   PSIBASE_REFLECT_EVENTS(Chainmail);
    PSIBASE_REFLECT_HISTORY_EVENTS(Chainmail,
       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,
@@ -36,14 +33,12 @@ PSIO_REFLECT(TestService,
              method(sendAccount, a),
              method(sendTime, t))
 
-PSIBASE_REFLECT_EVENTS(TestService);
 PSIBASE_REFLECT_HISTORY_EVENTS(TestService,
                                method(testEvent, i, d, v, s),
                                method(opt, opt),
                                method(optb, opt),
                                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
       };
@@ -118,11 +117,9 @@ namespace UserService
          method(getInvite, inviteId),
          method(getExpDate, inviteId),
       );
-      PSIBASE_REFLECT_EVENTS(Invite);
       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/Nft/include/services/user/Nft.hpp

@@ -74,7 +74,6 @@ namespace UserService
       method(exists, nftId),
       method(getUserConf, account, flag)
    );
-   PSIBASE_REFLECT_EVENTS(Nft);
    PSIBASE_REFLECT_HISTORY_EVENTS(Nft,
       method(minted, nftId, issuer),
       method(burned, nftId, owner),