Skip to content

Commit 1ec7992

Browse files
emidev98emidev98
committed
fix: remaining APIs, tests and proto generation
1 parent 3389e03 commit 1ec7992

File tree

9 files changed

+1438
-515
lines changed

9 files changed

+1438
-515
lines changed

‎docs/proto/proto-docs.md‎

Lines changed: 79 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,14 @@
5454
- [QueryAllianceDelegationResponse](#alliance.alliance.QueryAllianceDelegationResponse)
5555
- [QueryAllianceDelegationRewardsRequest](#alliance.alliance.QueryAllianceDelegationRewardsRequest)
5656
- [QueryAllianceDelegationRewardsResponse](#alliance.alliance.QueryAllianceDelegationRewardsResponse)
57+
- [QueryAllianceRedelegationsByDelegatorRequest](#alliance.alliance.QueryAllianceRedelegationsByDelegatorRequest)
58+
- [QueryAllianceRedelegationsByDelegatorResponse](#alliance.alliance.QueryAllianceRedelegationsByDelegatorResponse)
5759
- [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest)
5860
- [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse)
5961
- [QueryAllianceRequest](#alliance.alliance.QueryAllianceRequest)
6062
- [QueryAllianceResponse](#alliance.alliance.QueryAllianceResponse)
63+
- [QueryAllianceUnbondingsByDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDelegatorRequest)
64+
- [QueryAllianceUnbondingsByDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDelegatorResponse)
6165
- [QueryAllianceUnbondingsByDenomAndDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest)
6266
- [QueryAllianceUnbondingsByDenomAndDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorResponse)
6367
- [QueryAllianceUnbondingsRequest](#alliance.alliance.QueryAllianceUnbondingsRequest)
@@ -136,6 +140,7 @@
136140
| ----- | ---- | ----- | ----------- |
137141
| `denom` | [string](#string) | | |
138142
| `index` | [string](#string) | | |
143+
| `alliance` | [string](#string) | | |
139144

140145

141146

@@ -678,6 +683,7 @@ UnbondingDelegation defines an unbonding object with relevant metadata.
678683
| `completion_time` | [google.protobuf.Timestamp](#google.protobuf.Timestamp) | | completion_time is the unix time for unbonding completion. |
679684
| `validator_address` | [string](#string) | | validator_address is the bech32-encoded address of the validator. |
680685
| `amount` | [string](#string) | | amount defines the tokens to receive at completion. |
686+
| `denom` | [string](#string) | | alliance denom of the unbonding delegation |
681687

682688

683689

@@ -813,6 +819,38 @@ AllianceDelegation
813819

814820

815821

822+
<a name="alliance.alliance.QueryAllianceRedelegationsByDelegatorRequest"></a>
823+
824+
### QueryAllianceRedelegationsByDelegatorRequest
825+
826+
827+
828+
| Field | Type | Label | Description |
829+
| ----- | ---- | ----- | ----------- |
830+
| `delegator_addr` | [string](#string) | | |
831+
| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | |
832+
833+
834+
835+
836+
837+
838+
<a name="alliance.alliance.QueryAllianceRedelegationsByDelegatorResponse"></a>
839+
840+
### QueryAllianceRedelegationsByDelegatorResponse
841+
842+
843+
844+
| Field | Type | Label | Description |
845+
| ----- | ---- | ----- | ----------- |
846+
| `redelegations` | [RedelegationEntry](#alliance.alliance.RedelegationEntry) | repeated | |
847+
| `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) | | |
848+
849+
850+
851+
852+
853+
816854
<a name="alliance.alliance.QueryAllianceRedelegationsRequest"></a>
817855

818856
### QueryAllianceRedelegationsRequest
@@ -876,6 +914,37 @@ Alliance
876914

877915

878916

917+
<a name="alliance.alliance.QueryAllianceUnbondingsByDelegatorRequest"></a>
918+
919+
### QueryAllianceUnbondingsByDelegatorRequest
920+
AllianceDelegation
921+
922+
923+
| Field | Type | Label | Description |
924+
| ----- | ---- | ----- | ----------- |
925+
| `delegator_addr` | [string](#string) | | |
926+
| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | |
927+
928+
929+
930+
931+
932+
933+
<a name="alliance.alliance.QueryAllianceUnbondingsByDelegatorResponse"></a>
934+
935+
### QueryAllianceUnbondingsByDelegatorResponse
936+
937+
938+
939+
| Field | Type | Label | Description |
940+
| ----- | ---- | ----- | ----------- |
941+
| `unbondings` | [UnbondingDelegation](#alliance.alliance.UnbondingDelegation) | repeated | |
942+
943+
944+
945+
946+
947+
879948
<a name="alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest"></a>
880949

881950
### QueryAllianceUnbondingsByDenomAndDelegatorRequest
@@ -1161,21 +1230,21 @@ Params
11611230

11621231
| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
11631232
| ----------- | ------------ | ------------- | ------------| ------- | -------- |
1164-
| `Params` | [QueryParamsRequest](#alliance.alliance.QueryParamsRequest) | [QueryParamsResponse](#alliance.alliance.QueryParamsResponse) | | GET|/terra/alliances/params|
1165-
| `Alliances` | [QueryAlliancesRequest](#alliance.alliance.QueryAlliancesRequest) | [QueryAlliancesResponse](#alliance.alliance.QueryAlliancesResponse) | Query paginated alliances | GET|/terra/alliances|
1166-
| `IBCAlliance` | [QueryIBCAllianceRequest](#alliance.alliance.QueryIBCAllianceRequest) | [QueryAllianceResponse](#alliance.alliance.QueryAllianceResponse) | Query a specific alliance by ibc hash @deprecated: this endpoint will be replaced for by the encoded version of the denom e.g.: GET:/terra/alliances/ibc%2Falliance | GET|/terra/alliances/ibc/{hash}|
1167-
| `AllAlliancesDelegations` | [QueryAllAlliancesDelegationsRequest](#alliance.alliance.QueryAllAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations | GET|/terra/alliances/delegations|
1233+
| `Params` | [QueryParamsRequest](#alliance.alliance.QueryParamsRequest) | [QueryParamsResponse](#alliance.alliance.QueryParamsResponse) | Query Alliance module parameters more info about the params https://docs.alliance.money/tech/parameters | GET|/terra/alliances/params|
1234+
| `Alliances` | [QueryAlliancesRequest](#alliance.alliance.QueryAlliancesRequest) | [QueryAlliancesResponse](#alliance.alliance.QueryAlliancesResponse) | Query all alliances with pagination | GET|/terra/alliances|
1235+
| `AllAlliancesDelegations` | [QueryAllAlliancesDelegationsRequest](#alliance.alliance.QueryAllAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all alliances delegations with pagination | GET|/terra/alliances/delegations|
11681236
| `AllianceValidator` | [QueryAllianceValidatorRequest](#alliance.alliance.QueryAllianceValidatorRequest) | [QueryAllianceValidatorResponse](#alliance.alliance.QueryAllianceValidatorResponse) | Query alliance validator | GET|/terra/alliances/validators/{validator_addr}|
11691237
| `AllAllianceValidators` | [QueryAllAllianceValidatorsRequest](#alliance.alliance.QueryAllAllianceValidatorsRequest) | [QueryAllianceValidatorsResponse](#alliance.alliance.QueryAllianceValidatorsResponse) | Query all paginated alliance validators | GET|/terra/alliances/validators|
11701238
| `AlliancesDelegation` | [QueryAlliancesDelegationsRequest](#alliance.alliance.QueryAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations for a delegator addr | GET|/terra/alliances/delegations/{delegator_addr}|
11711239
| `AlliancesDelegationByValidator` | [QueryAlliancesDelegationByValidatorRequest](#alliance.alliance.QueryAlliancesDelegationByValidatorRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations for a delegator addr and validator_addr | GET|/terra/alliances/delegations/{delegator_addr}/{validator_addr}|
1172-
| `AllianceDelegation` | [QueryAllianceDelegationRequest](#alliance.alliance.QueryAllianceDelegationRequest) | [QueryAllianceDelegationResponse](#alliance.alliance.QueryAllianceDelegationResponse) | Query a delegation to an alliance by delegator addr, validator_addr and denom | GET|/terra/alliances/delegations/{delegator_addr}/{validator_addr}/{denom}|
1173-
| `IBCAllianceDelegation` | [QueryIBCAllianceDelegationRequest](#alliance.alliance.QueryIBCAllianceDelegationRequest) | [QueryAllianceDelegationResponse](#alliance.alliance.QueryAllianceDelegationResponse) | Query a delegation to an alliance by delegator addr, validator_addr and denom @deprecated: this endpoint will be replaced for by the encoded version of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance | GET|/terra/alliances/delegations/{delegator_addr}/{validator_addr}/ibc/{hash}|
1174-
| `AllianceDelegationRewards` | [QueryAllianceDelegationRewardsRequest](#alliance.alliance.QueryAllianceDelegationRewardsRequest) | [QueryAllianceDelegationRewardsResponse](#alliance.alliance.QueryAllianceDelegationRewardsResponse) | Query for rewards by delegator addr, validator_addr and denom | GET|/terra/alliances/rewards/{delegator_addr}/{validator_addr}/{denom}|
1240+
| `AllianceDelegation` | [QueryAllianceDelegationRequest](#alliance.alliance.QueryAllianceDelegationRequest) | [QueryAllianceDelegationResponse](#alliance.alliance.QueryAllianceDelegationResponse) | Query a specific delegation by delegator addr, validator addr and denom | GET|/terra/alliances/delegations/{delegator_addr}/{validator_addr}/{denom}|
1241+
| `AllianceDelegationRewards` | [QueryAllianceDelegationRewardsRequest](#alliance.alliance.QueryAllianceDelegationRewardsRequest) | [QueryAllianceDelegationRewardsResponse](#alliance.alliance.QueryAllianceDelegationRewardsResponse) | Query a specific delegation rewards by delegator addr, validator addr and denom | GET|/terra/alliances/rewards/{delegator_addr}/{validator_addr}/{denom}|
11751242
| `IBCAllianceDelegationRewards` | [QueryIBCAllianceDelegationRewardsRequest](#alliance.alliance.QueryIBCAllianceDelegationRewardsRequest) | [QueryAllianceDelegationRewardsResponse](#alliance.alliance.QueryAllianceDelegationRewardsResponse) | Query for rewards by delegator addr, validator_addr and denom @deprecated: this endpoint will be replaced for by the encoded version of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance | GET|/terra/alliances/rewards/{delegator_addr}/{validator_addr}/ibc/{hash}|
1176-
| `AllianceUnbondingsByDenomAndDelegator` | [QueryAllianceUnbondingsByDenomAndDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest) | [QueryAllianceUnbondingsByDenomAndDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorResponse) | Query for rewards by delegator addr, validator_addr and denom | GET|/terra/alliances/unbondings/{denom}/{delegator_addr}|
1177-
| `AllianceUnbondings` | [QueryAllianceUnbondingsRequest](#alliance.alliance.QueryAllianceUnbondingsRequest) | [QueryAllianceUnbondingsResponse](#alliance.alliance.QueryAllianceUnbondingsResponse) | Query for rewards by delegator addr, validator_addr and denom | GET|/terra/alliances/unbondings/{denom}/{delegator_addr}/{validator_addr}|
1178-
| `AllianceRedelegations` | [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest) | [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse) | Query redelegations by denom and delegator address | GET|/terra/alliances/redelegations/{denom}/{delegator_addr}|
1243+
| `AllianceUnbondingsByDelegator` | [QueryAllianceUnbondingsByDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDelegatorRequest) | [QueryAllianceUnbondingsByDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDelegatorResponse) | Query unbondings by delegator address | GET|/terra/alliances/unbondings/{delegator_addr}|
1244+
| `AllianceUnbondingsByDenomAndDelegator` | [QueryAllianceUnbondingsByDenomAndDelegatorRequest](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorRequest) | [QueryAllianceUnbondingsByDenomAndDelegatorResponse](#alliance.alliance.QueryAllianceUnbondingsByDenomAndDelegatorResponse) | Query unbondings by denom, delegator addr | GET|/terra/alliances/unbondings/{denom}/{delegator_addr}|
1245+
| `AllianceUnbondings` | [QueryAllianceUnbondingsRequest](#alliance.alliance.QueryAllianceUnbondingsRequest) | [QueryAllianceUnbondingsResponse](#alliance.alliance.QueryAllianceUnbondingsResponse) | Query unbondings by denom, delegator addr, validator addr | GET|/terra/alliances/unbondings/{denom}/{delegator_addr}/{validator_addr}|
1246+
| `AllianceRedelegationsByDelegator` | [QueryAllianceRedelegationsByDelegatorRequest](#alliance.alliance.QueryAllianceRedelegationsByDelegatorRequest) | [QueryAllianceRedelegationsByDelegatorResponse](#alliance.alliance.QueryAllianceRedelegationsByDelegatorResponse) | Query paginated redelegations delegator addr | GET|/terra/alliances/redelegations/{delegator_addr}|
1247+
| `AllianceRedelegations` | [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest) | [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse) | Query paginated redelegations by denom and delegator addr | GET|/terra/alliances/redelegations/{denom}/{delegator_addr}|
11791248
| `Alliance` | [QueryAllianceRequest](#alliance.alliance.QueryAllianceRequest) | [QueryAllianceResponse](#alliance.alliance.QueryAllianceResponse) | Query a specific alliance by denom | GET|/terra/alliances/{denom}|
11801249

11811250
<!-- end services -->

‎x/alliance/keeper/tests/delegation_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,6 @@ func TestSuccessfulRedelegation(t *testing.T) {
412412
},
413413
}, redelegationsRes)
414414

415-
unbondingPeriod, err := app.StakingKeeper.UnbondingTime(ctx)
416-
require.NoError(t, err)
417415
require.Equal(t, types.RedelegationEntry{
418416
DelegatorAddress: delAddr1.String(),
419417
SrcValidatorAddress: valAddr1.String(),

‎x/alliance/keeper/tests/grpc_query_test.go‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,6 @@ func TestQueryAnUniqueIBCAlliance(t *testing.T) {
160160
alliances, err := queryServer.Alliance(ctx, &types.QueryAllianceRequest{
161161
Denom: "ibc%2Falliance2",
162162
})
163-
alliancesIbcEndpoint, err2 := queryServer.IBCAlliance(ctx, &types.QueryIBCAllianceRequest{ //nolint:staticcheck // SA1019: types.types.QueryIBCAllianceRequest is deprecated
164-
Hash: "alliance2",
165-
})
166163

167164
// THEN: VALIDATE THAT BOTH ALLIANCES HAVE THE CORRECT MODEL WHEN QUERYING
168165
require.Nil(t, err)
@@ -178,20 +175,6 @@ func TestQueryAnUniqueIBCAlliance(t *testing.T) {
178175
RewardChangeInterval: 0,
179176
},
180177
}, alliances)
181-
182-
require.Nil(t, err2)
183-
require.Equal(t, &types.QueryAllianceResponse{
184-
Alliance: &types.AllianceAsset{
185-
Denom: "ibc/alliance2",
186-
RewardWeight: sdk.NewDec(10),
187-
RewardWeightRange: types.RewardWeightRange{Min: sdk.NewDec(2), Max: sdk.NewDec(12)},
188-
TakeRate: sdk.MustNewDecFromStr("0.14159265359"),
189-
TotalTokens: sdk.ZeroInt(),
190-
TotalValidatorShares: sdk.NewDec(0),
191-
RewardChangeRate: sdk.NewDec(0),
192-
RewardChangeInterval: 0,
193-
},
194-
}, alliancesIbcEndpoint)
195178
}
196179

197180
func TestQueryAllianceNotFound(t *testing.T) {

‎x/alliance/keeper/tests/unbonding_test.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,13 @@ func TestUnbondingMethods(t *testing.T) {
3030
RewardWeightRange: types.RewardWeightRange{Min: math.LegacyNewDec(0), Max: math.LegacyNewDec(1)},
3131
IsInitialized: true,
3232
}
33-
err := app.AllianceKeeper.SetAsset(ctx, allianceAsset)
34-
require.NoError(t, err)
33+
app.AllianceKeeper.SetAsset(ctx, allianceAsset)
3534

3635
// Query staking module unbonding time to assert later on
37-
unbondingTime, err := app.StakingKeeper.UnbondingTime(ctx)
38-
require.NoError(t, err)
36+
unbondingTime := app.StakingKeeper.UnbondingTime(ctx)
3937

4038
// Get the native delegations to have a validator address where to delegate
41-
delegations, err := app.StakingKeeper.GetAllDelegations(ctx)
42-
require.NoError(t, err)
39+
delegations := app.StakingKeeper.GetAllDelegations(ctx)
4340
valAddr, err := sdk.ValAddressFromBech32(delegations[0].ValidatorAddress)
4441
require.NoError(t, err)
4542

‎x/alliance/keeper/unbonding.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package keeper
22

33
import (
44
"bytes"
5-
"context"
65

76
sdk "github.com/cosmos/cosmos-sdk/types"
87

@@ -19,11 +18,11 @@ func (k Keeper) GetUnbondings(
1918
valAddr sdk.ValAddress,
2019
) (unbondingDelegations []types.UnbondingDelegation, err error) {
2120
// Get the store
22-
store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
21+
store := ctx.KVStore(k.storeKey)
2322
// create the iterator with the correct prefix
2423
prefix := types.GetUndelegationsIndexOrderedByValidatorKey(valAddr)
2524
// Get the iterator
26-
iter := storetypes.KVStorePrefixIterator(store, prefix)
25+
iter := sdk.KVStorePrefixIterator(store, prefix)
2726
defer iter.Close()
2827
suffix := types.GetPartialUnbondingKeySuffix(denom, delAddr)
2928

@@ -114,7 +113,7 @@ func (k Keeper) CompleteUnbondings(ctx sdk.Context) error {
114113

115114
// This method retun all in-progress unbondings for a given delegator address
116115
func (k Keeper) GetUnbondingsByDelegator(
117-
ctx context.Context,
116+
ctx sdk.Context,
118117
delAddr sdk.AccAddress,
119118
) (unbondingDelegations []types.UnbondingDelegation, err error) {
120119
// Get and iterate over all alliances

‎x/alliance/tests/e2e/delegate_undelegate_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,14 @@ func TestDelegatingASmallAmount(t *testing.T) {
247247
unbondings, err := app.AllianceKeeper.GetUnbondingsByDenomAndDelegator(ctx, allianceAsset2, user1)
248248
require.NoError(t, err)
249249
require.Len(t, unbondings, 2)
250-
require.Equal(t, val1.GetOperator(), unbondings[0].ValidatorAddress)
250+
require.Equal(t, val1.GetOperator().String(), unbondings[0].ValidatorAddress)
251251
require.Equal(t, math.NewInt(100), unbondings[0].Amount)
252252

253253
// Query the unbondings in progress
254254
unbondings2, err := app.AllianceKeeper.GetUnbondings(ctx, allianceAsset2, user1, vals[0])
255255
require.NoError(t, err)
256256
require.Len(t, unbondings2, 2)
257-
require.Equal(t, val1.GetOperator(), unbondings2[0].ValidatorAddress)
257+
require.Equal(t, val1.GetOperator().String(), unbondings2[0].ValidatorAddress)
258258
require.Equal(t, math.NewInt(100), unbondings2[0].Amount)
259259
}
260260

0 commit comments

Comments
 (0)