From 70b21893e0ab7995e79a13e43bc6515bcb2ab62d Mon Sep 17 00:00:00 2001 From: Slyghtning Date: Thu, 25 Apr 2024 15:17:59 +0200 Subject: [PATCH] staticaddr: public deposit method scope --- staticaddr/deposit/deposit.go | 8 ++++---- staticaddr/deposit/fsm.go | 12 ++++++------ staticaddr/deposit/sql_store.go | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/staticaddr/deposit/deposit.go b/staticaddr/deposit/deposit.go index d2bda01f..8c119991 100644 --- a/staticaddr/deposit/deposit.go +++ b/staticaddr/deposit/deposit.go @@ -71,28 +71,28 @@ func (d *Deposit) IsInFinalState() bool { return d.state == Expired || d.state == Failed } -func (d *Deposit) isExpired(currentHeight, expiry uint32) bool { +func (d *Deposit) IsExpired(currentHeight, expiry uint32) bool { d.Lock() defer d.Unlock() return currentHeight >= uint32(d.ConfirmationHeight)+expiry } -func (d *Deposit) getState() fsm.StateType { +func (d *Deposit) GetState() fsm.StateType { d.Lock() defer d.Unlock() return d.state } -func (d *Deposit) setState(state fsm.StateType) { +func (d *Deposit) SetState(state fsm.StateType) { d.Lock() defer d.Unlock() d.state = state } -func (d *Deposit) isInState(state fsm.StateType) bool { +func (d *Deposit) IsInState(state fsm.StateType) bool { d.Lock() defer d.Unlock() diff --git a/staticaddr/deposit/fsm.go b/staticaddr/deposit/fsm.go index 89d2222c..91bc951d 100644 --- a/staticaddr/deposit/fsm.go +++ b/staticaddr/deposit/fsm.go @@ -100,7 +100,7 @@ func NewFSM(ctx context.Context, deposit *Deposit, cfg *ManagerConfig, if recoverStateMachine { depoFsm.StateMachine = fsm.NewStateMachineWithState( - depositStates, deposit.getState(), + depositStates, deposit.GetState(), DefaultObserverSize, ) } else { @@ -145,8 +145,8 @@ func (f *FSM) handleBlockNotification(ctx context.Context, // If the deposit is expired but not yet sufficiently confirmed, we // republish the expiry sweep transaction. - if f.deposit.isExpired(currentHeight, params.Expiry) { - if f.deposit.isInState(WaitForExpirySweep) { + if f.deposit.IsExpired(currentHeight, params.Expiry) { + if f.deposit.IsInState(WaitForExpirySweep) { f.PublishDepositExpirySweepAction(ctx, nil) } else { go func() { @@ -232,13 +232,13 @@ func (f *FSM) updateDeposit(ctx context.Context, notification.Event, ) - f.deposit.setState(notification.NextState) + f.deposit.SetState(notification.NextState) // Don't update the deposit if we are in an initial state or if we // are transitioning from an initial state to a failed state. d := f.deposit - if d.isInState(fsm.EmptyState) || d.isInState(Deposited) || - (notification.PreviousState == Deposited && d.isInState( + if d.IsInState(fsm.EmptyState) || d.IsInState(Deposited) || + (notification.PreviousState == Deposited && d.IsInState( Failed, )) { diff --git a/staticaddr/deposit/sql_store.go b/staticaddr/deposit/sql_store.go index f746ee7f..72900775 100644 --- a/staticaddr/deposit/sql_store.go +++ b/staticaddr/deposit/sql_store.go @@ -44,7 +44,7 @@ func (s *SqlStore) CreateDeposit(ctx context.Context, deposit *Deposit) error { updateArgs := sqlc.InsertDepositUpdateParams{ DepositID: deposit.ID[:], UpdateTimestamp: s.clock.Now().UTC(), - UpdateState: string(deposit.getState()), + UpdateState: string(deposit.GetState()), } return s.baseDB.ExecTx(ctx, &loopdb.SqliteTxOptions{}, @@ -63,7 +63,7 @@ func (s *SqlStore) UpdateDeposit(ctx context.Context, deposit *Deposit) error { insertUpdateArgs := sqlc.InsertDepositUpdateParams{ DepositID: deposit.ID[:], UpdateTimestamp: s.clock.Now().UTC(), - UpdateState: string(deposit.getState()), + UpdateState: string(deposit.GetState()), } var (