Minor tweaks to events types

chain/types/actor_event.go

@@ -31,11 +31,11 @@ type SubActorEventFilter struct {
 type ActorEventFilter struct {
 	// Matches events from one of these actors, or any actor if empty.
 	// For now, this MUST be a Filecoin address.
-	Addresses []address.Address `json:"addresses"`
+	Addresses []address.Address `json:"addresses,omitempty"`
 
 	// Matches events with the specified key/values, or all events if empty.
 	// If the value is an empty slice, the filter will match on the key only, accepting any value.
-	Fields map[string][]ActorEventBlock `json:"fields"`
+	Fields map[string][]ActorEventBlock `json:"fields,omitempty"`
 
 	// Interpreted as an epoch (in hex) or one of "latest" for last mined block, "earliest" for first,
 	// Optional, default: "latest".
@@ -65,8 +65,8 @@ type ActorEvent struct {
 	Height abi.ChainEpoch `json:"height"`
 
 	// CID of the tipset that contained the message that produced this event.
-	TipSetKey cid.Cid `json:"tipset_cid"`
+	TipSetCid cid.Cid `json:"tipsetCid"`
 
 	// CID of message that produced this event.
-	MsgCid cid.Cid `json:"msg_cid"`
+	MsgCid cid.Cid `json:"msgCid"`
 }

chain/types/actor_event_test.go

@@ -32,7 +32,7 @@ func TestActorEventJson(t *testing.T) {
 		EmitterAddr: randomF4Addr(t, rng),
 		Reverted:    false,
 		Height:      1001,
-		TipSetKey:   randomCid(t, rng),
+		TipSetCid:   randomCid(t, rng),
 		MsgCid:      randomCid(t, rng),
 	}
 

itests/direct_data_onboard_test.go

@@ -527,7 +527,7 @@ func buildActorEventsFromMessages(ctx context.Context, t *testing.T, node v1api.
 						EmitterAddr: addr,
 						Reverted:    false,
 						Height:      ts.Height(),
-						TipSetKey:   tsCid,
+						TipSetCid:   tsCid,
 						MsgCid:      m.Cid,
 					})
 				}

node/impl/full/actor_event.go

@@ -175,7 +175,7 @@ func (a *ActorEvent) SubscribeActorEvents(ctx context.Context, f *types.SubActor
 					EmitterAddr: ce.EmitterAddr,
 					Reverted:    ce.Reverted,
 					Height:      ce.Height,
-					TipSetKey:   c,
+					TipSetCid:   c,
 					MsgCid:      ce.MsgCid,
 				}
 
@@ -215,7 +215,7 @@ func getCollected(ctx context.Context, f *filter.EventFilter) ([]*types.ActorEve
 			EmitterAddr: e.EmitterAddr,
 			Reverted:    e.Reverted,
 			Height:      e.Height,
-			TipSetKey:   c,
+			TipSetCid:   c,
 			MsgCid:      e.MsgCid,
 		}