nits

api/v1/client.go

@@ -253,7 +253,7 @@ func (c *storageClient) Transaction(ctx context.Context, r *http.Request) (*apiT
 }
 
 // Events returns a list of events.
-func (c *storageClient) Events(ctx context.Context, r *http.Request) (*apiTypes.EventsList, error) {
+func (c *storageClient) Events(ctx context.Context, r *http.Request) (*apiTypes.ConsensusEventList, error) {
 	var q storage.EventsRequest
 
 	params := r.URL.Query()

api/v1/handlers.go

@@ -100,7 +100,7 @@ func (h *Handler) ListEvents(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("content-type", "application/json")
 	if _, err := w.Write(resp); err != nil {
 		h.logger.Error("failed to write response",
-			"request_id", ctx.Value(storage.RequestIDContextKey),
+			"request_id", ctx.Value(common.RequestIDContextKey),
 			"error", err,
 		)
 		h.metrics.RequestCounter(r.URL.Path, "failure", "http_error").Inc()

storage/client/types.go

@@ -21,18 +21,10 @@ type TransactionList = api.TransactionList
 type Transaction = api.Transaction
 
 // EventsList is the storage response for ListEvents.
-type EventsList struct {
-	Events []Event `json:"events"`
-}
+type EventList = api.ConsensusEventList
 
 // Event is a consensus event.
-type Event struct {
-	Height  int64   `json:"height"`
-	TxIndex *int32  `json:"tx_index,omitempty"`
-	TxHash  *string `json:"hash,omitempty"`
-	Type    string  `json:"type"`
-	Body    []byte  `json:"body"`
-}
+type Event = api.ConsensusEvent
 
 // EntityList is the storage response for ListEntities.
 type EntityList = api.EntityList