rename

protocol/x/subaccounts/keeper/subaccount.go

@@ -770,33 +770,33 @@ func (k Keeper) GetAllRelevantPerpetuals(
 	perptypes.PerpInfos,
 	error,
 ) {
-	subaccountIdsMap := make(map[types.SubaccountId]struct{})
-	perpIdsMap := make(map[uint32]struct{})
+	subaccountIdsSet := make(map[types.SubaccountId]struct{})
+	perpIdsSet := make(map[uint32]struct{})
 
 	// Add all relevant perpetuals in every update.
 	for _, update := range updates {
 		// If this subaccount has not been processed already, get all of its existing perpetuals.
-		if _, exists := subaccountIdsMap[update.SubaccountId]; !exists {
+		if _, exists := subaccountIdsSet[update.SubaccountId]; !exists {
 			sa := k.GetSubaccount(ctx, update.SubaccountId)
 			for _, postition := range sa.PerpetualPositions {
-				perpIdsMap[postition.PerpetualId] = struct{}{}
+				perpIdsSet[postition.PerpetualId] = struct{}{}
 			}
-			subaccountIdsMap[update.SubaccountId] = struct{}{}
+			subaccountIdsSet[update.SubaccountId] = struct{}{}
 		}
 
 		// Add all perpetuals in the update.
 		for _, perpUpdate := range update.PerpetualUpdates {
-			perpIdsMap[perpUpdate.GetId()] = struct{}{}
+			perpIdsSet[perpUpdate.GetId()] = struct{}{}
 		}
 	}
 
 	// Important: Sort the perpIds to ensure determinism!
-	perpIdsOrdered := lib.GetSortedKeys[lib.Sortable[uint32]](perpIdsMap)
+	sortedPerpIds := lib.GetSortedKeys[lib.Sortable[uint32]](perpIdsSet)
 
 	// Get all perpetual information from state.
 	ltCache := make(map[uint32]perptypes.LiquidityTier)
-	perpInfos := make(perptypes.PerpInfos, len(perpIdsOrdered))
-	for _, perpId := range perpIdsOrdered {
+	perpInfos := make(perptypes.PerpInfos, len(sortedPerpIds))
+	for _, perpId := range sortedPerpIds {
 		perpetual, price, err := k.perpetualsKeeper.GetPerpetualAndMarketPrice(ctx, perpId)
 		if err != nil {
 			return nil, err

protocol/x/subaccounts/keeper/subaccount_test.go

@@ -6033,12 +6033,6 @@ func TestGetAllRelevantPerpetuals_Deterministic(t *testing.T) {
 		// updates
 		assetUpdates     []types.AssetUpdate
 		perpetualUpdates []types.PerpetualUpdate
-
-		// expectations
-		expectedNetCollateral     *big.Int
-		expectedInitialMargin     *big.Int
-		expectedMaintenanceMargin *big.Int
-		expectedErr               error
 	}{
 		"Gas used is deterministic when erroring on gas usage": {
 			assetPositions: testutil.CreateUsdcAssetPositions(big.NewInt(10_000_000_001)), // $10,000.000001