Skip to content

Commit

Permalink
Fix typo.
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentwschau committed Mar 19, 2024
1 parent 36f47ac commit 049b8b0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
20 changes: 10 additions & 10 deletions protocol/x/subaccounts/keeper/isolated_subaccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const (
)

// Represents a state transition for an isolated perpetual.
type isolatedPerpetualStateTranisition struct {
type isolatedPerpetualStateTransition struct {
perpetualId uint32
// TODO(DEC-715): Support non-USDC assets.
// USDC position size of the subaccount that has a state change for an isolated perpetual.
Expand Down Expand Up @@ -50,12 +50,12 @@ func (k Keeper) checkIsolatedSubaccountConstraints(
) (
success bool,
successPerUpdate []types.UpdateResult,
isolatedPerpetualStateTranisitions []*isolatedPerpetualStateTranisition,
isolatedPerpetualStateTransitions []*isolatedPerpetualStateTransition,
err error,
) {
success = true
successPerUpdate = make([]types.UpdateResult, len(settledUpdates))
isolatedPerpetualStateTranisitions = make([]*isolatedPerpetualStateTranisition, len(settledUpdates))
isolatedPerpetualStateTransitions = make([]*isolatedPerpetualStateTransition, len(settledUpdates))
var perpIdToMarketType = make(map[uint32]perptypes.PerpetualMarketType)

for _, perpetual := range perpetuals {
Expand All @@ -72,10 +72,10 @@ func (k Keeper) checkIsolatedSubaccountConstraints(
}

successPerUpdate[i] = result
isolatedPerpetualStateTranisitions[i] = stateTransition
isolatedPerpetualStateTransitions[i] = stateTransition
}

return success, successPerUpdate, isolatedPerpetualStateTranisitions, nil
return success, successPerUpdate, isolatedPerpetualStateTransitions, nil
}

// processIsolatedPerpetualUpdates checks whether the perpetual updates to a settled subaccount
Expand All @@ -95,7 +95,7 @@ func (k Keeper) checkIsolatedSubaccountConstraints(
func processIsolatedPerpetualUpdates(
settledUpdate settledUpdate,
perpIdToMarketType map[uint32]perptypes.PerpetualMarketType,
) (types.UpdateResult, *isolatedPerpetualStateTranisition, error) {
) (types.UpdateResult, *isolatedPerpetualStateTransition, error) {
// If there are no perpetual updates, then this update does not violate constraints for isolated
// markets.
if len(settledUpdate.PerpetualUpdates) == 0 {
Expand Down Expand Up @@ -191,7 +191,7 @@ func getIsolatedPerpetualStateTransition(
settledSubaccount types.Subaccount,
isolatedPerpetualPosition *types.PerpetualPosition,
isolatedPerpetualUpdate *types.PerpetualUpdate,
) *isolatedPerpetualStateTranisition {
) *isolatedPerpetualStateTransition {
// If there is no update to an isolated perpetual position, then no state transitions have
// happened for the isolated perpetual.
if isolatedPerpetualUpdate == nil {
Expand All @@ -205,7 +205,7 @@ func getIsolatedPerpetualStateTransition(
// If the subaccount has no isolated perpetual position, then this update is opening an isolated
// perpetual position.
if isolatedPerpetualPosition == nil {
return &isolatedPerpetualStateTranisition{
return &isolatedPerpetualStateTransition{
perpetualId: perpetualId,
usdcQuantumsBeforeUpdate: usdcQuantumsBeforeUpdate,
transition: opened,
Expand All @@ -218,7 +218,7 @@ func getIsolatedPerpetualStateTransition(
isolatedPerpetualPosition.GetBigQuantums(),
isolatedPerpetualUpdate.GetBigQuantums(),
); finalPositionSize.Cmp(lib.BigInt0()) == 0 {
return &isolatedPerpetualStateTranisition{
return &isolatedPerpetualStateTransition{
perpetualId: perpetualId,
usdcQuantumsBeforeUpdate: usdcQuantumsBeforeUpdate,
transition: closed,
Expand All @@ -237,7 +237,7 @@ func getIsolatedPerpetualStateTransition(
func (k *Keeper) transferCollateralForIsolatedPerpetual(
ctx sdk.Context,
updatedSubaccount types.Subaccount,
stateTransition *isolatedPerpetualStateTranisition,
stateTransition *isolatedPerpetualStateTransition,
) error {
// No collateral to transfer if no state transition.
if stateTransition == nil {
Expand Down
10 changes: 5 additions & 5 deletions protocol/x/subaccounts/keeper/subaccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ func (k Keeper) UpdateSubaccounts(
}

allPerps := k.perpetualsKeeper.GetAllPerpetuals(ctx)
success, successPerUpdate, isolatedPerpetualStateTranisitions, err := k.internalCanUpdateSubaccounts(
success, successPerUpdate, isolatedPerpetualStateTransitions, err := k.internalCanUpdateSubaccounts(
ctx,
settledUpdates,
updateType,
Expand Down Expand Up @@ -312,7 +312,7 @@ func (k Keeper) UpdateSubaccounts(

// Transfer collateral between collateral pools for any isolated perpetual positions that changed
// state due to an update.
for i, stateTransition := range isolatedPerpetualStateTranisitions {
for i, stateTransition := range isolatedPerpetualStateTransitions {
if err := k.transferCollateralForIsolatedPerpetual(
ctx,
settledUpdates[i].SettledSubaccount,
Expand Down Expand Up @@ -556,13 +556,13 @@ func (k Keeper) internalCanUpdateSubaccounts(
) (
success bool,
successPerUpdate []types.UpdateResult,
isolatedPerpetualStateTransitions []*isolatedPerpetualStateTranisition,
isolatedPerpetualStateTransitions []*isolatedPerpetualStateTransition,
err error,
) {
// TODO(TRA-99): Add integration / E2E tests on order placement / matching with this new
// constraint.
// Check if the updates satisfy the isolated perpetual constraints.
success, successPerUpdate, isolatedPerpetualStateTranisitions, err := k.checkIsolatedSubaccountConstraints(
success, successPerUpdate, isolatedPerpetualStateTransitions, err = k.checkIsolatedSubaccountConstraints(
ctx,
settledUpdates,
perpetuals,
Expand Down Expand Up @@ -711,7 +711,7 @@ func (k Keeper) internalCanUpdateSubaccounts(
successPerUpdate[i] = result
}

return success, successPerUpdate, isolatedPerpetualStateTranisitions, nil
return success, successPerUpdate, isolatedPerpetualStateTransitions, nil
}

// IsValidStateTransitionForUndercollateralizedSubaccount returns an `UpdateResult`
Expand Down

0 comments on commit 049b8b0

Please sign in to comment.