Skip to content

Commit 8051494

Browse files
Joe Bowmanjoe-bowman
Joe Bowman
authored and
joe-bowman
committed
remove old ics code that is unused
1 parent 9bcc8c9 commit 8051494

File tree

2 files changed

+11
-118
lines changed

2 files changed

+11
-118
lines changed

‎x/participationrewards/keeper/rewards_holdings.go

+5-32
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
sdk "github.com/cosmos/cosmos-sdk/types"
77

88
"github.com/quicksilver-zone/quicksilver/utils"
9-
"github.com/quicksilver-zone/quicksilver/utils/addressutils"
109
airdroptypes "github.com/quicksilver-zone/quicksilver/x/airdrop/types"
1110
cmtypes "github.com/quicksilver-zone/quicksilver/x/claimsmanager/types"
1211
icstypes "github.com/quicksilver-zone/quicksilver/x/interchainstaking/types"
@@ -17,7 +16,7 @@ func (k Keeper) AllocateHoldingsRewards(ctx sdk.Context) error {
1716
// obtain and iterate all claim records for each zone
1817
k.icsKeeper.IterateZones(ctx, func(index int64, zone *icstypes.Zone) (stop bool) {
1918
k.Logger(ctx).Info("zones", "zone", zone.ChainId)
20-
userAllocations, remaining, _ := k.CalcUserHoldingsAllocations(ctx, zone)
19+
userAllocations, remaining := k.CalcUserHoldingsAllocations(ctx, zone)
2120

2221
if err := k.DistributeToUsersFromModule(ctx, userAllocations); err != nil {
2322
k.Logger(ctx).Error("failed to distribute to users", "ua", userAllocations, "err", err)
@@ -41,19 +40,16 @@ func (k Keeper) AllocateHoldingsRewards(ctx sdk.Context) error {
4140
}
4241

4342
// CalcUserHoldingsAllocations calculates allocations per user for a given zone, based upon claims submitted and zone.
44-
func (k Keeper) CalcUserHoldingsAllocations(ctx sdk.Context, zone *icstypes.Zone) ([]types.UserAllocation, math.Int, []types.UserAllocation) {
43+
func (k Keeper) CalcUserHoldingsAllocations(ctx sdk.Context, zone *icstypes.Zone) ([]types.UserAllocation, math.Int) {
4544
k.Logger(ctx).Info("CalcUserHoldingsAllocations", "zone", zone.ChainId, "allocations", zone.HoldingsAllocation)
4645

4746
userAllocations := make([]types.UserAllocation, 0)
48-
icsRewardsAllocations := make([]types.UserAllocation, 0)
49-
icsRewardsBalance := sdk.NewCoins()
50-
icsRewardsPerAsset := make(map[string]sdk.Dec, 0)
5147

5248
supply := k.bankKeeper.GetSupply(ctx, zone.LocalDenom)
5349

5450
if zone.HoldingsAllocation == 0 || !supply.Amount.IsPositive() {
5551
k.Logger(ctx).Info("holdings allocation is zero, nothing to allocate")
56-
return userAllocations, math.NewIntFromUint64(zone.HoldingsAllocation), icsRewardsAllocations
52+
return userAllocations, math.NewIntFromUint64(zone.HoldingsAllocation)
5753
}
5854

5955
// calculate user totals and zone total (held assets)
@@ -83,26 +79,12 @@ func (k Keeper) CalcUserHoldingsAllocations(ctx sdk.Context, zone *icstypes.Zone
8379

8480
if !zoneAmount.IsPositive() {
8581
k.Logger(ctx).Info("zero claims for zone", "zone", zone.ChainId)
86-
return userAllocations, math.NewIntFromUint64(zone.HoldingsAllocation), icsRewardsAllocations
82+
return userAllocations, math.NewIntFromUint64(zone.HoldingsAllocation)
8783
}
8884

8985
zoneAllocation := math.NewIntFromUint64(zone.HoldingsAllocation)
9086
tokensPerAsset := sdk.NewDecFromInt(zoneAllocation).Quo(sdk.NewDecFromInt(supply.Amount))
9187

92-
if zone.WithdrawalAddress != nil {
93-
// determine ics rewards to be distributed per token.
94-
icsRewardsAddr, err := addressutils.AddressFromBech32(zone.WithdrawalAddress.Address, zone.AccountPrefix)
95-
if err != nil {
96-
panic("unable to unmarshal withdrawal address")
97-
}
98-
icsRewardsBalance = k.bankKeeper.GetAllBalances(ctx, icsRewardsAddr)
99-
icsRewardsPerAsset = make(map[string]sdk.Dec, len(icsRewardsBalance))
100-
for _, rewardsAsset := range icsRewardsBalance {
101-
icsRewardsPerAsset[rewardsAsset.Denom] = sdk.NewDecFromInt(rewardsAsset.Amount).Quo(sdk.NewDecFromInt(supply.Amount))
102-
}
103-
104-
k.Logger(ctx).Info("ics rewards per asset", "zone", zone.ChainId, "icsrpa", icsRewardsPerAsset)
105-
}
10688
k.Logger(ctx).Info("tokens per asset", "zone", zone.ChainId, "tpa", tokensPerAsset)
10789

10890
for _, address := range utils.Keys(userAmountsMap) {
@@ -118,16 +100,7 @@ func (k Keeper) CalcUserHoldingsAllocations(ctx sdk.Context, zone *icstypes.Zone
118100
panic("user allocation overflow")
119101
}
120102

121-
// allocate ics rewards
122-
for _, rewardsAsset := range icsRewardsBalance {
123-
icsRewardsAllocation := types.UserAllocation{
124-
Address: address,
125-
Amount: sdk.NewCoin(rewardsAsset.Denom, sdk.NewDecFromInt(amount).Mul(icsRewardsPerAsset[rewardsAsset.Denom]).TruncateInt()),
126-
}
127-
icsRewardsAllocations = append(icsRewardsAllocations, icsRewardsAllocation)
128-
}
129-
130103
}
131104

132-
return userAllocations, zoneAllocation, icsRewardsAllocations
105+
return userAllocations, zoneAllocation
133106
}

‎x/participationrewards/keeper/rewards_holdings_test.go

+6-86
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
1818
ctx := suite.chainA.GetContext()
1919
bondDenom := appA.StakingKeeper.BondDenom(ctx)
2020
tests := []struct {
21-
name string
22-
malleate func(ctx sdk.Context, appA *app.Quicksilver)
23-
want []types.UserAllocation
24-
icsWant []types.UserAllocation
25-
remainder math.Int
26-
icsRemainder sdk.Coins
27-
wantErr string
21+
name string
22+
malleate func(ctx sdk.Context, appA *app.Quicksilver)
23+
want []types.UserAllocation
24+
remainder math.Int
25+
wantErr string
2826
}{
2927
{
3028
"zero claims; no allocation",
@@ -34,9 +32,7 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
3432
appA.InterchainstakingKeeper.SetZone(ctx, &zone)
3533
},
3634
[]types.UserAllocation{},
37-
[]types.UserAllocation{},
3835
sdk.ZeroInt(),
39-
sdk.NewCoins(),
4036
"",
4137
},
4238
{
@@ -49,9 +45,7 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
4945
appA.ClaimsManagerKeeper.SetLastEpochClaim(ctx, &cmtypes.Claim{UserAddress: user2.String(), ChainId: "otherchain-1", Module: cmtypes.ClaimTypeLiquidToken, SourceChainId: suite.chainA.ChainID, Amount: math.NewInt(1000)})
5046
},
5147
[]types.UserAllocation{},
52-
[]types.UserAllocation{},
5348
sdk.NewInt(64000),
54-
sdk.NewCoins(),
5549
"",
5650
},
5751
{
@@ -75,9 +69,7 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
7569
Amount: sdk.NewCoin(bondDenom, sdk.NewInt(2500)),
7670
},
7771
},
78-
[]types.UserAllocation{},
7972
sdk.ZeroInt(),
80-
sdk.NewCoins(),
8173
"",
8274
},
8375
{
@@ -101,9 +93,7 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
10193
Amount: sdk.NewCoin(bondDenom, sdk.NewInt(2000)), // 1000 / 2500 (0.4) * 5000 = 2000
10294
},
10395
},
104-
[]types.UserAllocation{},
10596
sdk.NewInt(2000),
106-
sdk.NewCoins(),
10797
"",
10898
},
10999
{
@@ -127,9 +117,7 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
127117
Amount: sdk.NewCoin(bondDenom, sdk.NewInt(3333)), // 1000/1500 (0.66666) * 5000 = 3333
128118
},
129119
},
130-
[]types.UserAllocation{},
131120
sdk.OneInt(),
132-
sdk.NewCoins(),
133121
"",
134122
},
135123
{
@@ -155,18 +143,7 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
155143
Amount: sdk.NewCoin(bondDenom, sdk.NewInt(3333)), // 1000/1500 (0.66666) * 5000 = 3333
156144
},
157145
},
158-
[]types.UserAllocation{
159-
{
160-
Address: user1.String(),
161-
Amount: sdk.NewCoin("testcoin", sdk.NewInt(300)), // 500/1500 (0.33333) * 900 == 300
162-
},
163-
{
164-
Address: user2.String(),
165-
Amount: sdk.NewCoin("testcoin", sdk.NewInt(600)), // 1000/1500 (0.66666) * 900 = 600
166-
},
167-
},
168146
sdk.OneInt(),
169-
sdk.NewCoins(),
170147
"",
171148
},
172149
{
@@ -197,34 +174,7 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
197174
Amount: sdk.NewCoin(bondDenom, sdk.NewInt(3333)), // 1000/1500 (0.66666) * 5000 = 3333
198175
},
199176
},
200-
[]types.UserAllocation{
201-
{
202-
Address: user1.String(),
203-
Amount: sdk.NewCoin("testcoin", sdk.NewInt(300)), // 500/1500 (0.33333) * 900 == 300
204-
},
205-
{
206-
Address: user2.String(),
207-
Amount: sdk.NewCoin("testcoin", sdk.NewInt(600)), // 1000/1500 (0.66666) * 900 = 600
208-
},
209-
{
210-
Address: user1.String(),
211-
Amount: sdk.NewCoin("testcoin2", sdk.NewInt(6000)), // 500/1500 (0.33333) * 18k == 6k
212-
},
213-
{
214-
Address: user2.String(),
215-
Amount: sdk.NewCoin("testcoin2", sdk.NewInt(12001)), // 1000/1500 (0.66666) * 18k = 12k
216-
},
217-
{
218-
Address: user1.String(),
219-
Amount: sdk.NewCoin("testcoin3", sdk.NewInt(50)), // 500/1500 (0.33333) * 150 == 50
220-
},
221-
{
222-
Address: user2.String(),
223-
Amount: sdk.NewCoin("testcoin3", sdk.NewInt(100)), // 1000/1500 (0.66666) * 150 = 100
224-
},
225-
},
226177
sdk.OneInt(),
227-
sdk.NewCoins(sdk.NewCoin("testcoin2", sdk.NewIntFromUint64(1))),
228178
"",
229179
},
230180

@@ -254,29 +204,7 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
254204
Amount: sdk.NewCoin(bondDenom, sdk.NewInt(2000)), // 1000 / 2500 (0.4) * 5000 = 2000
255205
},
256206
},
257-
[]types.UserAllocation{
258-
{
259-
Address: user1.String(),
260-
Amount: sdk.NewCoin("testcoin", sdk.NewInt(180)), // 500/1500 (0.33333) * 900 == 300
261-
},
262-
{
263-
Address: user2.String(),
264-
Amount: sdk.NewCoin("testcoin", sdk.NewInt(360)), // 1000/1500 (0.66666) * 900 = 600
265-
},
266-
{
267-
Address: user1.String(),
268-
Amount: sdk.NewCoin("testcoin2", sdk.NewInt(3600)), // 500/1500 (0.33333) * 18k == 6k
269-
},
270-
{
271-
Address: user2.String(),
272-
Amount: sdk.NewCoin("testcoin2", sdk.NewInt(7200)), // 1000/1500 (0.66666) * 18k = 12k
273-
},
274-
},
275207
sdk.NewInt(2000),
276-
sdk.NewCoins(
277-
sdk.NewCoin("testcoin", sdk.NewInt(360)),
278-
sdk.NewCoin("testcoin2", sdk.NewInt(7202)),
279-
),
280208
"",
281209
},
282210
}
@@ -299,17 +227,9 @@ func (suite *KeeperTestSuite) TestCalcUserHoldingsAllocations() {
299227
suite.NoError(appA.BankKeeper.MintCoins(ctx, "mint", sdk.NewCoins(sdk.NewCoin(appA.StakingKeeper.BondDenom(ctx), sdk.NewIntFromUint64(zone.HoldingsAllocation)))))
300228
suite.NoError(appA.BankKeeper.SendCoinsFromModuleToModule(ctx, "mint", types.ModuleName, sdk.NewCoins(sdk.NewCoin(appA.StakingKeeper.BondDenom(ctx), sdk.NewIntFromUint64(zone.HoldingsAllocation)))))
301229

302-
allocations, remainder, icsRewardsAllocations := appA.ParticipationRewardsKeeper.CalcUserHoldingsAllocations(ctx, &zone)
230+
allocations, remainder := appA.ParticipationRewardsKeeper.CalcUserHoldingsAllocations(ctx, &zone)
303231
suite.ElementsMatch(tt.want, allocations)
304-
suite.ElementsMatch(tt.icsWant, icsRewardsAllocations)
305232
suite.True(tt.remainder.Equal(remainder))
306-
307-
// distribute assets to users; check remainder (to be distributed next time!)
308-
err := appA.ParticipationRewardsKeeper.DistributeToUsersFromAddress(ctx, icsRewardsAllocations, zone.WithdrawalAddress.Address)
309-
suite.NoError(err)
310-
icsAddress, _ := addressutils.AddressFromBech32(zone.WithdrawalAddress.Address, "")
311-
icsBalance := appA.BankKeeper.GetAllBalances(ctx, icsAddress)
312-
suite.ElementsMatch(tt.icsRemainder, icsBalance)
313233
})
314234
}
315235
}

0 commit comments

Comments
 (0)