chore(notifications): fix merge conflict

gobitfly · Oct 10, 2024 · 7de9ba1 · 7de9ba1
1 parent 8370382
commit 7de9ba1
Showing 1 changed file with 9 additions and 23 deletions.
diff --git a/backend/pkg/commons/types/frontend.go b/backend/pkg/commons/types/frontend.go
@@ -65,25 +65,13 @@ func (npui NotificationsPerUserId) AddNotification(n Notification) {
 }
 
 const (
-	ValidatorMissedProposalEventName                EventName = "validator_proposal_missed"
-	ValidatorExecutedProposalEventName              EventName = "validator_proposal_submitted"
-	ValidatorMissedAttestationEventName             EventName = "validator_attestation_missed"
-	ValidatorGotSlashedEventName                    EventName = "validator_got_slashed"
-	ValidatorDidSlashEventName                      EventName = "validator_did_slash"
-	ValidatorIsOfflineEventName                     EventName = "validator_is_offline"
-	ValidatorGroupIsOfflineEventName                EventName = "validator_group_is_offline"
-	ValidatorReceivedWithdrawalEventName            EventName = "validator_withdrawal"
-	NetworkLivenessIncreasedEventName               EventName = "network_liveness_increased"
-	EthClientUpdateEventName                        EventName = "eth_client_update"
-	MonitoringMachineOfflineEventName               EventName = "monitoring_machine_offline"
-	MonitoringMachineDiskAlmostFullEventName        EventName = "monitoring_hdd_almostfull"
-	MonitoringMachineCpuLoadEventName               EventName = "monitoring_cpu_load"
-	MonitoringMachineMemoryUsageEventName           EventName = "monitoring_memory_usage"
-	TaxReportEventName                              EventName = "user_tax_report"
-	ValidatorBalanceDecreasedEventName              EventName = "validator_balance_decreased"
-	ValidatorMissedProposalEventName                EventName = "validator_proposal_missed"
-	ValidatorExecutedProposalEventName              EventName = "validator_proposal_submitted"
-	ValidatorDidSlashEventName                      EventName = "validator_did_slash"
+	ValidatorMissedProposalEventName   EventName = "validator_proposal_missed"
+	ValidatorExecutedProposalEventName EventName = "validator_proposal_submitted"
+
+	ValidatorDidSlashEventName         EventName = "validator_did_slash"
+	ValidatorGroupIsOfflineEventName   EventName = "validator_group_is_offline"
+	ValidatorBalanceDecreasedEventName EventName = "validator_balance_decreased"
+
 	ValidatorReceivedDepositEventName               EventName = "validator_received_deposit"
 	NetworkSlashingEventName                        EventName = "network_slashing"
 	NetworkValidatorActivationQueueFullEventName    EventName = "network_validator_activation_queue_full"
@@ -93,14 +81,12 @@ const (
 	NetworkLivenessIncreasedEventName               EventName = "network_liveness_increased"
 	TaxReportEventName                              EventName = "user_tax_report"
 	//nolint:misspell
-	RocketpoolCommissionThresholdEventName  EventName = "rocketpool_commision_threshold"
-	RocketpoolNewClaimRoundStartedEventName EventName = "rocketpool_new_claimround"
-	//nolint:misspell
 	RocketpoolCollateralMinReachedEventName EventName = "rocketpool_colleteral_min"
 	//nolint:misspell
 	RocketpoolCollateralMaxReachedEventName EventName = "rocketpool_colleteral_max"
 	SyncCommitteeSoonEventName              EventName = "validator_synccommittee_soon"
-	RocketpoolCommissionThresholdEventName  EventName = "rocketpool_commision_threshold"
+	//nolint:misspell
+	RocketpoolCommissionThresholdEventName EventName = "rocketpool_commision_threshold"
 
 	// Validator dashboard events
 	ValidatorIsOfflineEventName          EventName = "validator_is_offline"