cleaned up event names (#111)

Fairblock · Feb 21, 2024 · d6beb7a · d6beb7a
1 parent 02af070
commit d6beb7a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/x/keyshare/types/keys.go b/x/keyshare/types/keys.go
@@ -34,55 +34,55 @@ const (
 )
 
 const (
-	RegisteredValidatorEventType    = "new validator-registered"
+	RegisteredValidatorEventType    = "new-validator-registered"
 	RegisteredValidatorEventCreator = "creator"
 )
 
 const (
 	SendKeyshareEventType                = "keyshare-sent"
 	SendKeyshareEventValidator           = "validator"
-	SendKeyshareEventKeyshareBlockHeight = "keyshare-block-height"
-	SendKeyshareEventReceivedBlockHeight = "received-block-height"
-	SendKeyshareEventMessage             = "keyshare-message"
-	SendKeyshareEventIndex               = "keyshare-index"
+	SendKeyshareEventKeyshareBlockHeight = "keyshare-height"
+	SendKeyshareEventReceivedBlockHeight = "received-height"
+	SendKeyshareEventMessage             = "message"
+	SendKeyshareEventIndex               = "index"
 )
 
 const (
 	StartSendGeneralKeyShareEventType     = "start-send-general-keyshare"
-	StartSendGeneralKeyShareEventIdentity = "start-send-general-keyshare-identity"
+	StartSendGeneralKeyShareEventIdentity = "identity"
 )
 
 const (
 	SendGeneralKeyshareEventType                = "keyshare-sent"
 	SendGeneralKeyshareEventValidator           = "validator"
-	SendGeneralKeyshareEventReceivedBlockHeight = "received-block-height"
-	SendGeneralKeyshareEventMessage             = "keyshare-message"
-	SendGeneralKeyshareEventIDType              = "keyshare-id-type"
-	SendGeneralKeyshareEventIdValue             = "keyshare-id-value"
-	SendGeneralKeyshareEventIndex               = "keyshare-index"
+	SendGeneralKeyshareEventReceivedBlockHeight = "received-height"
+	SendGeneralKeyshareEventMessage             = "message"
+	SendGeneralKeyshareEventIDType              = "id-type"
+	SendGeneralKeyshareEventIdValue             = "id-value"
+	SendGeneralKeyshareEventIndex               = "index"
 )
 
 const (
 	KeyShareAggregatedEventType        = "keyshare-aggregated"
-	KeyShareAggregatedEventBlockHeight = "keyshare-aggregated-block-height"
-	KeyShareAggregatedEventData        = "keyshare-aggregated-data"
-	KeyShareAggregatedEventPubKey      = "keyshare-aggregated-pubkey"
+	KeyShareAggregatedEventBlockHeight = "height"
+	KeyShareAggregatedEventData        = "data"
+	KeyShareAggregatedEventPubKey      = "pubkey"
 )
 
 const (
 	GeneralKeyShareAggregatedEventType    = "keyshare-aggregated"
-	GeneralKeyShareAggregatedEventIDValue = "keyshare-aggregated-id-value"
-	GeneralKeyShareAggregatedEventIDType  = "keyshare-aggregated-id-type"
-	GeneralKeyShareAggregatedEventData    = "keyshare-aggregated-data"
-	GeneralKeyShareAggregatedEventPubKey  = "keyshare-aggregated-pubkey"
+	GeneralKeyShareAggregatedEventIDValue = "id-value"
+	GeneralKeyShareAggregatedEventIDType  = "id-type"
+	GeneralKeyShareAggregatedEventData    = "data"
+	GeneralKeyShareAggregatedEventPubKey  = "pubkey"
 )
 
 const (
 	QueuedPubKeyCreatedEventType                     = "queued-pubkey-created"
-	QueuedPubKeyCreatedEventActivePubkeyExpiryHeight = "queued-pubkey-created-active-pubkey-expiry-height"
-	QueuedPubKeyCreatedEventExpiryHeight             = "queued-pubkey-created-expiry-height"
-	QueuedPubKeyCreatedEventCreator                  = "queued-pubkey-created-creator"
-	QueuedPubKeyCreatedEventPubkey                   = "queued-pubkey-created-pubkey"
+	QueuedPubKeyCreatedEventActivePubkeyExpiryHeight = "active-pubkey-expiry-height"
+	QueuedPubKeyCreatedEventExpiryHeight             = "expiry-height"
+	QueuedPubKeyCreatedEventCreator                  = "creator"
+	QueuedPubKeyCreatedEventPubkey                   = "pubkey"
 )
 
 const (

diff --git a/x/pep/types/keys.go b/x/pep/types/keys.go
@@ -59,8 +59,8 @@ const (
 
 const (
 	EncryptedTxDiscardedEventType   = "discarded-encrypted-tx"
-	EncryptedTxDiscardedEventHeight = "discarded-height"
-	EncryptedTxDiscardedEventTxIDs  = "discarded-tx-ids"
+	EncryptedTxDiscardedEventHeight = "height"
+	EncryptedTxDiscardedEventTxIDs  = "tx-ids"
 )
 
 const (