Skip to content

Commit aaddc51

Browse files
davidli1997jusbar23
davidli1997
and
jusbar23
authored
[TEST] Revert merge conflict PR (#3227)
Co-authored-by: Justin Barnett <[email protected]>
1 parent 20f3511 commit aaddc51

File tree

14 files changed

+32
-1638
lines changed

14 files changed

+32
-1638
lines changed

‎protocol/testutil/keeper/clob.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,14 @@ func NewClobKeepersTestContextWithUninitializedMemStore(
123123
cdc,
124124
indexerEventsTransientStoreKey,
125125
)
126-
ks.FeeTiersKeeper, _ = createFeeTiersKeeper(stateStore, ks.StatsKeeper, ks.VaultKeeper, ks.AffiliatesKeeper, db, cdc)
126+
ks.FeeTiersKeeper, _ = createFeeTiersKeeper(
127+
stateStore,
128+
ks.StatsKeeper,
129+
ks.VaultKeeper,
130+
ks.AffiliatesKeeper,
131+
db,
132+
cdc,
133+
)
127134
revShareKeeper, _, _ := createRevShareKeeper(
128135
stateStore,
129136
db,

‎protocol/testutil/keeper/feetiers.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ func createFeeTiersKeeper(
3333
delaymsgtypes.ModuleAddress.String(),
3434
lib.GovModuleAddress.String(),
3535
}
36-
3736
k := keeper.NewKeeper(
3837
cdc,
3938
statsKeeper,

‎protocol/testutil/keeper/listing.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,14 @@ func ListingKeepers(
8989
cdc,
9090
transientStoreKey,
9191
)
92-
feeTiersKeeper, _ := createFeeTiersKeeper(stateStore, statsKeeper, vaultKeeper, affiliatesKeeper, db, cdc)
92+
feeTiersKeeper, _ := createFeeTiersKeeper(
93+
stateStore,
94+
statsKeeper,
95+
vaultKeeper,
96+
affiliatesKeeper,
97+
db,
98+
cdc,
99+
)
93100
revShareKeeper, _, _ := createRevShareKeeper(stateStore, db, cdc, affiliatesKeeper, feeTiersKeeper, statsKeeper)
94101
marketMapKeeper, _ = createMarketMapKeeper(stateStore, db, cdc)
95102
pricesKeeper, _, _, mockTimeProvider = createPricesKeeper(

‎protocol/testutil/keeper/rewards.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,14 @@ func RewardsKeepers(
7272
cdc,
7373
transientStoreKey,
7474
)
75-
feetiersKeeper, _ = createFeeTiersKeeper(stateStore, statsKeeper, vaultKeeper, affiliatesKeeper, db, cdc)
75+
feetiersKeeper, _ = createFeeTiersKeeper(
76+
stateStore,
77+
statsKeeper,
78+
vaultKeeper,
79+
affiliatesKeeper,
80+
db,
81+
cdc,
82+
)
7683
revShareKeeper, _, _ := createRevShareKeeper(stateStore, db, cdc, affiliatesKeeper, feetiersKeeper, statsKeeper)
7784
marketMapKeeper, _ := createMarketMapKeeper(stateStore, db, cdc)
7885
pricesKeeper, _, _, _ = createPricesKeeper(stateStore, db, cdc, transientStoreKey, revShareKeeper, marketMapKeeper)

‎protocol/x/clob/keeper/liquidations_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func TestPlacePerpetualLiquidation(t *testing.T) {
290290

291291
ks := keepertest.NewClobKeepersTestContext(t, memClob, mockBankKeeper, indexer_manager.NewIndexerEventManagerNoop())
292292

293-
ctx := ks.Ctx.WithIsCheckTx(true).WithBlockTime(time.Unix(5, 0))
293+
ctx := ks.Ctx.WithIsCheckTx(true)
294294
// Create the default markets.
295295
keepertest.CreateTestMarkets(t, ctx, ks.PricesKeeper)
296296

@@ -418,7 +418,7 @@ func TestPlacePerpetualLiquidation_validateLiquidationAgainstClobPairStatus(t *t
418418
memClob := memclob.NewMemClobPriceTimePriority(false)
419419
mockBankKeeper := &mocks.BankKeeper{}
420420
ks := keepertest.NewClobKeepersTestContext(t, memClob, mockBankKeeper, indexer_manager.NewIndexerEventManagerNoop())
421-
ctx := ks.Ctx.WithIsCheckTx(true).WithBlockTime(time.Unix(5, 0))
421+
ctx := ks.Ctx.WithIsCheckTx(true)
422422

423423
// Create the default markets.
424424
keepertest.CreateTestMarkets(t, ks.Ctx, ks.PricesKeeper)
@@ -1190,7 +1190,7 @@ func TestPlacePerpetualLiquidation_PreexistingLiquidation(t *testing.T) {
11901190
mockIndexerEventManager.On("Enabled").Return(false)
11911191
ks := keepertest.NewClobKeepersTestContext(t, memclob, bankKeeper, mockIndexerEventManager)
11921192

1193-
ctx := ks.Ctx.WithIsCheckTx(true).WithBlockTime(time.Unix(5, 0))
1193+
ctx := ks.Ctx.WithIsCheckTx(true)
11941194

11951195
keepertest.CreateTestMarkets(t, ctx, ks.PricesKeeper)
11961196

@@ -2109,7 +2109,7 @@ func TestPlacePerpetualLiquidation_Deleveraging(t *testing.T) {
21092109
mockIndexerEventManager.On("Enabled").Return(false)
21102110
ks := keepertest.NewClobKeepersTestContext(t, memclob, bankKeeper, mockIndexerEventManager)
21112111

2112-
ctx := ks.Ctx.WithIsCheckTx(true).WithBlockTime(time.Unix(5, 0))
2112+
ctx := ks.Ctx.WithIsCheckTx(true)
21132113

21142114
keepertest.CreateTestMarkets(t, ctx, ks.PricesKeeper)
21152115

@@ -2287,7 +2287,7 @@ func TestPlacePerpetualLiquidation_SendOffchainMessages(t *testing.T) {
22872287
ks := keepertest.NewClobKeepersTestContext(t, memClob, &mocks.BankKeeper{}, indexerEventManager)
22882288
ctx := ks.Ctx.WithTxBytes(constants.TestTxBytes)
22892289
// CheckTx mode set correctly
2290-
ctx = ctx.WithIsCheckTx(true).WithBlockTime(time.Unix(5, 0))
2290+
ctx = ctx.WithIsCheckTx(true)
22912291

22922292
ks.MarketMapKeeper.InitGenesis(ks.Ctx, constants.MarketMap_DefaultGenesisState)
22932293
prices.InitGenesis(ctx, *ks.PricesKeeper, constants.Prices_DefaultGenesisState)
@@ -4800,7 +4800,7 @@ func TestMaybeGetLiquidationOrder(t *testing.T) {
48004800
),
48014801
)
48024802
ks := keepertest.NewClobKeepersTestContext(t, memClob, mockBankKeeper, indexer_manager.NewIndexerEventManagerNoop())
4803-
ctx := ks.Ctx.WithIsCheckTx(true).WithBlockTime(time.Unix(5, 0))
4803+
ctx := ks.Ctx.WithIsCheckTx(true)
48044804

48054805
// Create the default markets.
48064806
keepertest.CreateTestMarkets(t, ctx, ks.PricesKeeper)

‎protocol/x/clob/keeper/mev_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package keeper_test
33
import (
44
"math/big"
55
"testing"
6-
"time"
76

87
sdkmath "cosmossdk.io/math"
98
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -859,7 +858,7 @@ func TestRecordMevMetrics(t *testing.T) {
859858
mockBankKeeper,
860859
indexer_manager.NewIndexerEventManagerNoop(),
861860
)
862-
ctx := ks.Ctx.WithIsCheckTx(true).WithBlockTime(time.Unix(5, 0))
861+
ctx := ks.Ctx.WithIsCheckTx(true)
863862

864863
// Create the default markets.
865864
keepertest.CreateTestMarkets(t, ctx, ks.PricesKeeper)
@@ -1254,7 +1253,7 @@ func TestGetMidPrices(t *testing.T) {
12541253
).Return(nil)
12551254

12561255
ks := keepertest.NewClobKeepersTestContext(t, memclob, mockBankKeeper, indexer_manager.NewIndexerEventManagerNoop())
1257-
ctx := ks.Ctx.WithIsCheckTx(true).WithBlockTime(time.Unix(5, 0))
1256+
ctx := ks.Ctx.WithIsCheckTx(true)
12581257

12591258
// Create the default markets.
12601259
keepertest.CreateTestMarkets(t, ctx, ks.PricesKeeper)

‎protocol/x/feetiers/client/cli/query.go‎

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
2323

2424
cmd.AddCommand(CmdQueryPerpetualFeeParams())
2525
cmd.AddCommand(CmdQueryUserFeeTier())
26-
<<<<<<< HEAD
27-
=======
28-
cmd.AddCommand(CmdQueryMarketFeeDiscountParams())
29-
cmd.AddCommand(CmdQueryStakingTiers())
30-
cmd.AddCommand(CmdQueryUserStakingTier())
31-
>>>>>>> c667de27 (consider staking tiers when calculating fees (#3195))
3226

3327
return cmd
3428
}
@@ -81,98 +75,3 @@ func CmdQueryUserFeeTier() *cobra.Command {
8175

8276
return cmd
8377
}
84-
<<<<<<< HEAD
85-
=======
86-
87-
func CmdQueryMarketFeeDiscountParams() *cobra.Command {
88-
cmd := &cobra.Command{
89-
Use: "get-market-fee-discount-params [clob_pair_id]",
90-
Short: "get the fee discount parameters for all markets or a specific CLOB pair",
91-
Args: cobra.MaximumNArgs(1),
92-
RunE: func(cmd *cobra.Command, args []string) (err error) {
93-
clientCtx := client.GetClientContextFromCmd(cmd)
94-
queryClient := types.NewQueryClient(clientCtx)
95-
96-
if len(args) == 0 {
97-
// Query all market fee discount params
98-
res, err := queryClient.AllMarketFeeDiscountParams(
99-
context.Background(),
100-
&types.QueryAllMarketFeeDiscountParamsRequest{},
101-
)
102-
if err != nil {
103-
return err
104-
}
105-
return clientCtx.PrintProto(res)
106-
} else {
107-
// Parse CLOB pair ID
108-
var clobPairID uint32
109-
if _, err := fmt.Sscanf(args[0], "%d", &clobPairID); err != nil {
110-
return fmt.Errorf("clob_pair_id %s not a valid uint32", args[0])
111-
}
112-
113-
// Query specific market fee discount params
114-
res, err := queryClient.PerMarketFeeDiscountParams(
115-
context.Background(),
116-
&types.QueryPerMarketFeeDiscountParamsRequest{
117-
ClobPairId: clobPairID,
118-
},
119-
)
120-
if err != nil {
121-
return err
122-
}
123-
return clientCtx.PrintProto(res)
124-
}
125-
},
126-
}
127-
128-
flags.AddQueryFlagsToCmd(cmd)
129-
return cmd
130-
}
131-
132-
func CmdQueryStakingTiers() *cobra.Command {
133-
cmd := &cobra.Command{
134-
Use: "staking-tiers",
135-
Short: "get all staking tiers",
136-
RunE: func(cmd *cobra.Command, args []string) (err error) {
137-
clientCtx := client.GetClientContextFromCmd(cmd)
138-
queryClient := types.NewQueryClient(clientCtx)
139-
res, err := queryClient.StakingTiers(
140-
context.Background(),
141-
&types.QueryStakingTiersRequest{},
142-
)
143-
if err != nil {
144-
return err
145-
}
146-
return clientCtx.PrintProto(res)
147-
},
148-
}
149-
150-
flags.AddQueryFlagsToCmd(cmd)
151-
return cmd
152-
}
153-
154-
func CmdQueryUserStakingTier() *cobra.Command {
155-
cmd := &cobra.Command{
156-
Use: "user-staking-tier [address]",
157-
Short: "get the staking tier and discount of a user",
158-
Args: cobra.ExactArgs(1),
159-
RunE: func(cmd *cobra.Command, args []string) (err error) {
160-
clientCtx := client.GetClientContextFromCmd(cmd)
161-
queryClient := types.NewQueryClient(clientCtx)
162-
res, err := queryClient.UserStakingTier(
163-
context.Background(),
164-
&types.QueryUserStakingTierRequest{
165-
Address: args[0],
166-
},
167-
)
168-
if err != nil {
169-
return err
170-
}
171-
return clientCtx.PrintProto(res)
172-
},
173-
}
174-
175-
flags.AddQueryFlagsToCmd(cmd)
176-
return cmd
177-
}
178-
>>>>>>> c667de27 (consider staking tiers when calculating fees (#3195))

‎protocol/x/feetiers/keeper/grpc_query.go‎

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
sdk "github.com/cosmos/cosmos-sdk/types"
77

8-
"github.com/dydxprotocol/v4-chain/protocol/dtypes"
98
"github.com/dydxprotocol/v4-chain/protocol/lib"
109
"github.com/dydxprotocol/v4-chain/protocol/x/feetiers/types"
1110
"google.golang.org/grpc/codes"
@@ -59,107 +58,3 @@ func (k Keeper) UserFeeTier(
5958
Tier: tier,
6059
}, nil
6160
}
62-
<<<<<<< HEAD
63-
=======
64-
65-
// PerMarketFeeDiscountParams processes a query for fee discount parameters for a specific market/CLOB pair.
66-
func (k Keeper) PerMarketFeeDiscountParams(
67-
c context.Context,
68-
req *types.QueryPerMarketFeeDiscountParamsRequest,
69-
) (
70-
*types.QueryPerMarketFeeDiscountParamsResponse,
71-
error,
72-
) {
73-
if req == nil {
74-
return nil, status.Error(codes.InvalidArgument, "invalid request")
75-
}
76-
77-
ctx := lib.UnwrapSDKContext(c, types.ModuleName)
78-
params, err := k.GetPerMarketFeeDiscountParams(ctx, req.ClobPairId)
79-
if err != nil {
80-
if errors.Is(err, types.ErrMarketFeeDiscountNotFound) {
81-
return nil, status.Error(codes.NotFound, "fee discount not found for the specified market/CLOB pair")
82-
}
83-
return nil, status.Errorf(codes.Internal, "failed to get per-market fee discount: %v", err)
84-
}
85-
86-
return &types.QueryPerMarketFeeDiscountParamsResponse{
87-
Params: params,
88-
}, nil
89-
}
90-
91-
// AllMarketFeeDiscountParams processes a query for all market fee discount parameters.
92-
func (k Keeper) AllMarketFeeDiscountParams(
93-
c context.Context,
94-
req *types.QueryAllMarketFeeDiscountParamsRequest,
95-
) (
96-
*types.QueryAllMarketFeeDiscountParamsResponse,
97-
error,
98-
) {
99-
if req == nil {
100-
return nil, status.Error(codes.InvalidArgument, "invalid request")
101-
}
102-
103-
ctx := lib.UnwrapSDKContext(c, types.ModuleName)
104-
params := k.GetAllMarketFeeDiscountParams(ctx)
105-
106-
return &types.QueryAllMarketFeeDiscountParamsResponse{
107-
Params: params,
108-
}, nil
109-
}
110-
111-
func (k Keeper) StakingTiers(
112-
c context.Context,
113-
req *types.QueryStakingTiersRequest,
114-
) (
115-
*types.QueryStakingTiersResponse,
116-
error,
117-
) {
118-
if req == nil {
119-
return nil, status.Error(codes.InvalidArgument, "invalid request")
120-
}
121-
122-
ctx := lib.UnwrapSDKContext(c, types.ModuleName)
123-
stakingTiers := k.GetAllStakingTiers(ctx)
124-
return &types.QueryStakingTiersResponse{
125-
StakingTiers: stakingTiers,
126-
}, nil
127-
}
128-
129-
func (k Keeper) UserStakingTier(
130-
c context.Context,
131-
req *types.QueryUserStakingTierRequest,
132-
) (
133-
*types.QueryUserStakingTierResponse,
134-
error,
135-
) {
136-
if req == nil {
137-
return nil, status.Error(codes.InvalidArgument, "invalid request")
138-
}
139-
140-
ctx := lib.UnwrapSDKContext(c, types.ModuleName)
141-
142-
// Validate address
143-
_, err := sdk.AccAddressFromBech32(req.Address)
144-
if err != nil {
145-
return nil, status.Error(codes.InvalidArgument, "invalid bech32 address")
146-
}
147-
148-
// Get the user's fee tier
149-
affiliateParameters, err := k.affiliatesKeeper.GetAffiliateParameters(ctx)
150-
if err != nil {
151-
return nil, err
152-
}
153-
_, userFeeTier := k.getUserFeeTier(ctx, req.Address, affiliateParameters.RefereeMinimumFeeTierIdx)
154-
155-
// Get user's staking info
156-
stakedAmount := k.statsKeeper.GetStakedAmount(ctx, req.Address)
157-
discountPpm := k.GetStakingDiscountPpm(ctx, userFeeTier.Name, stakedAmount)
158-
159-
return &types.QueryUserStakingTierResponse{
160-
FeeTierName: userFeeTier.Name,
161-
StakedBaseTokens: dtypes.NewIntFromBigInt(stakedAmount),
162-
DiscountPpm: discountPpm,
163-
}, nil
164-
}
165-
>>>>>>> c667de27 (consider staking tiers when calculating fees (#3195))

0 commit comments

Comments
 (0)