Remove WithdrawableStakingEventType and WithdrawnStakingEventType code (#18)

Author: kirugan

client/schema.go

@@ -1,25 +1,19 @@
 package client
 
 const (
-	ActiveStakingQueueName       string = "v2_active_staking_queue"
-	UnbondingStakingQueueName    string = "v2_unbonding_staking_queue"
-	WithdrawableStakingQueueName string = "v2_withdrawable_staking_queue"
-	WithdrawnStakingQueueName    string = "v2_withdrawn_staking_queue"
+	ActiveStakingQueueName    string = "v2_active_staking_queue"
+	UnbondingStakingQueueName string = "v2_unbonding_staking_queue"
 )
 
 const (
-	ActiveStakingEventType       EventType = 1
-	UnbondingStakingEventType    EventType = 2
-	WithdrawableStakingEventType EventType = 3
-	WithdrawnStakingEventType    EventType = 4
+	ActiveStakingEventType    EventType = 1
+	UnbondingStakingEventType EventType = 2
 )
 
 // Event schema versions, only increment when the schema changes
 const (
-	ActiveStakingEventVersion       int = 0
-	UnbondingStakingEventVersion    int = 0
-	WithdrawableStakingEventVersion int = 0
-	WithdrawnStakingEventVersion    int = 0
+	ActiveStakingEventVersion    int = 0
+	UnbondingStakingEventVersion int = 0
 )
 
 type EventType int
@@ -82,39 +76,3 @@ func NewUnbondingStakingEvent(
 		StateHistory:              stateHistory,
 	}
 }
-
-func NewWithdrawableStakingEvent(
-	stakingTxHashHex string,
-	stakerBtcPkHex string,
-	finalityProviderBtcPksHex []string,
-	stakingAmount uint64,
-	stateHistory []string,
-) StakingEvent {
-	return StakingEvent{
-		SchemaVersion:             WithdrawableStakingEventVersion,
-		EventType:                 WithdrawableStakingEventType,
-		StakingTxHashHex:          stakingTxHashHex,
-		StakerBtcPkHex:            stakerBtcPkHex,
-		FinalityProviderBtcPksHex: finalityProviderBtcPksHex,
-		StakingAmount:             stakingAmount,
-		StateHistory:              stateHistory,
-	}
-}
-
-func NewWithdrawnStakingEvent(
-	stakingTxHashHex string,
-	stakerBtcPkHex string,
-	finalityProviderBtcPksHex []string,
-	stakingAmount uint64,
-	stateHistory []string,
-) StakingEvent {
-	return StakingEvent{
-		SchemaVersion:             WithdrawnStakingEventVersion,
-		EventType:                 WithdrawnStakingEventType,
-		StakingTxHashHex:          stakingTxHashHex,
-		StakerBtcPkHex:            stakerBtcPkHex,
-		FinalityProviderBtcPksHex: finalityProviderBtcPksHex,
-		StakingAmount:             stakingAmount,
-		StateHistory:              stateHistory,
-	}
-}

queuemngr/queue_manager.go

@@ -15,11 +15,9 @@ import (
 const timeout = 5 * time.Second
 
 type QueueManager struct {
-	ActiveStakingQueue       client.QueueClient
-	UnbondingStakingQueue    client.QueueClient
-	WithdrawableStakingQueue client.QueueClient
-	WithdrawnStakingQueue    client.QueueClient
-	logger                   *zap.Logger
+	ActiveStakingQueue    client.QueueClient
+	UnbondingStakingQueue client.QueueClient
+	logger                *zap.Logger
 }
 
 func NewQueueManager(cfg *config.QueueConfig, logger *zap.Logger) (*QueueManager, error) {
@@ -33,22 +31,10 @@ func NewQueueManager(cfg *config.QueueConfig, logger *zap.Logger) (*QueueManager
 		return nil, fmt.Errorf("failed to create unbonding staking queue: %w", err)
 	}
 
-	withdrawableStakingQueue, err := client.NewQueueClient(cfg, client.WithdrawableStakingQueueName)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create withdrawable staking queue: %w", err)
-	}
-
-	withdrawnStakingQueue, err := client.NewQueueClient(cfg, client.WithdrawnStakingQueueName)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create withdrawn staking queue: %w", err)
-	}
-
 	return &QueueManager{
-		ActiveStakingQueue:       activeStakingQueue,
-		UnbondingStakingQueue:    unbondingStakingQueue,
-		WithdrawableStakingQueue: withdrawableStakingQueue,
-		WithdrawnStakingQueue:    withdrawnStakingQueue,
-		logger:                   logger.With(zap.String("module", "queue consumer")),
+		ActiveStakingQueue:    activeStakingQueue,
+		UnbondingStakingQueue: unbondingStakingQueue,
+		logger:                logger.With(zap.String("module", "queue consumer")),
 	}, nil
 }
 
@@ -95,41 +81,13 @@ func (qc *QueueManager) PushUnbondingStakingEvent(ctx context.Context, ev *clien
 	return nil
 }
 
-func (qc *QueueManager) PushWithdrawableStakingEvent(ctx context.Context, ev *client.StakingEvent) error {
-	qc.logger.Debug("pushing withdrawable staking event", zap.String("tx_hash", ev.StakingTxHashHex))
-
-	err := pushEvent(ctx, qc.WithdrawableStakingQueue, ev)
-	if err != nil {
-		return fmt.Errorf("failed to push staking event: %w", err)
-	}
-
-	qc.logger.Debug("successfully pushed withdrawable staking event", zap.String("tx_hash", ev.StakingTxHashHex))
-	return nil
-}
-
-func (qc *QueueManager) PushWithdrawnStakingEvent(ctx context.Context, ev *client.StakingEvent) error {
-	qc.logger.Debug("pushing withdrawn staking event", zap.String("tx_hash", ev.StakingTxHashHex))
-
-	err := pushEvent(ctx, qc.WithdrawnStakingQueue, ev)
-	if err != nil {
-		return fmt.Errorf("failed to push staking event: %w", err)
-	}
-
-	qc.logger.Debug("successfully pushed withdrawn staking event", zap.String("tx_hash", ev.StakingTxHashHex))
-	return nil
-}
-
 // requeue message
 func (qc *QueueManager) ReQueueMessage(ctx context.Context, message client.QueueMessage, queueName string) error {
 	switch queueName {
 	case client.ActiveStakingQueueName:
 		return qc.ActiveStakingQueue.ReQueueMessage(ctx, message)
 	case client.UnbondingStakingQueueName:
 		return qc.UnbondingStakingQueue.ReQueueMessage(ctx, message)
-	case client.WithdrawableStakingQueueName:
-		return qc.WithdrawableStakingQueue.ReQueueMessage(ctx, message)
-	case client.WithdrawnStakingQueueName:
-		return qc.WithdrawnStakingQueue.ReQueueMessage(ctx, message)
 	default:
 		return fmt.Errorf("unknown queue name: %s", queueName)
 	}
@@ -144,14 +102,6 @@ func (qc *QueueManager) Stop() error {
 		return err
 	}
 
-	if err := qc.WithdrawableStakingQueue.Stop(); err != nil {
-		return err
-	}
-
-	if err := qc.WithdrawnStakingQueue.Stop(); err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -160,8 +110,6 @@ func (qc *QueueManager) Ping() error {
 	queues := []client.QueueClient{
 		qc.ActiveStakingQueue,
 		qc.UnbondingStakingQueue,
-		qc.WithdrawableStakingQueue,
-		qc.WithdrawnStakingQueue,
 	}
 
 	for _, queue := range queues {