Skip to content

Commit bc52930

Browse files
javiersuweijiejaviersuweijie
authored
Merge pull request #289 from terra-money/chore/v0.4.x/remove/deprecations
chore(v0.4.x): remove deprecated endpoints
2 parents 93675c5 + 5cd8882 commit bc52930

File tree

7 files changed

+185
-1697
lines changed

7 files changed

+185
-1697
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ localnet-build-env: localnet-alliance-rmi
152152
localnet-build-nodes:
153153
$(DOCKER) run --rm -v $(CURDIR)/.testnets:/alliance terra-money/localnet-alliance \
154154
testnet init-files --v 3 -o /alliance --starting-ip-address 192.168.5.20 --keyring-backend=test --chain-id=alliance-testnet-1
155-
docker-compose up -d
155+
$(DOCKER) compose up -d
156156

157157
localnet-stop:
158-
docker-compose down
158+
$(DOCKER) compose down
159159

160160
localnet-start: localnet-stop localnet-build-env localnet-build-nodes
161161

‎docs/proto/proto-docs.md‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@
7070
- [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse)
7171
- [QueryAlliancesRequest](#alliance.alliance.QueryAlliancesRequest)
7272
- [QueryAlliancesResponse](#alliance.alliance.QueryAlliancesResponse)
73-
- [QueryIBCAllianceDelegationRequest](#alliance.alliance.QueryIBCAllianceDelegationRequest)
74-
- [QueryIBCAllianceDelegationRewardsRequest](#alliance.alliance.QueryIBCAllianceDelegationRewardsRequest)
75-
- [QueryIBCAllianceRequest](#alliance.alliance.QueryIBCAllianceRequest)
7673
- [QueryParamsRequest](#alliance.alliance.QueryParamsRequest)
7774
- [QueryParamsResponse](#alliance.alliance.QueryParamsResponse)
7875

@@ -1072,57 +1069,6 @@ Alliances
10721069

10731070

10741071

1075-
<a name="alliance.alliance.QueryIBCAllianceDelegationRequest"></a>
1076-
1077-
### QueryIBCAllianceDelegationRequest
1078-
1079-
1080-
1081-
| Field | Type | Label | Description |
1082-
| ----- | ---- | ----- | ----------- |
1083-
| `delegator_addr` | [string](#string) | | |
1084-
| `validator_addr` | [string](#string) | | |
1085-
| `hash` | [string](#string) | | |
1086-
| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | |
1087-
1088-
1089-
1090-
1091-
1092-
1093-
<a name="alliance.alliance.QueryIBCAllianceDelegationRewardsRequest"></a>
1094-
1095-
### QueryIBCAllianceDelegationRewardsRequest
1096-
1097-
1098-
1099-
| Field | Type | Label | Description |
1100-
| ----- | ---- | ----- | ----------- |
1101-
| `delegator_addr` | [string](#string) | | |
1102-
| `validator_addr` | [string](#string) | | |
1103-
| `hash` | [string](#string) | | |
1104-
| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | |
1105-
1106-
1107-
1108-
1109-
1110-
1111-
<a name="alliance.alliance.QueryIBCAllianceRequest"></a>
1112-
1113-
### QueryIBCAllianceRequest
1114-
1115-
1116-
1117-
| Field | Type | Label | Description |
1118-
| ----- | ---- | ----- | ----------- |
1119-
| `hash` | [string](#string) | | |
1120-
1121-
1122-
1123-
1124-
1125-
11261072
<a name="alliance.alliance.QueryParamsRequest"></a>
11271073

11281074
### QueryParamsRequest
@@ -1163,16 +1109,13 @@ Params
11631109
| ----------- | ------------ | ------------- | ------------| ------- | -------- |
11641110
| `Params` | [QueryParamsRequest](#alliance.alliance.QueryParamsRequest) | [QueryParamsResponse](#alliance.alliance.QueryParamsResponse) | | GET|/terra/alliances/params|
11651111
| `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}|
11671112
| `AllAlliancesDelegations` | [QueryAllAlliancesDelegationsRequest](#alliance.alliance.QueryAllAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations | GET|/terra/alliances/delegations|
11681113
| `AllianceValidator` | [QueryAllianceValidatorRequest](#alliance.alliance.QueryAllianceValidatorRequest) | [QueryAllianceValidatorResponse](#alliance.alliance.QueryAllianceValidatorResponse) | Query alliance validator | GET|/terra/alliances/validators/{validator_addr}|
11691114
| `AllAllianceValidators` | [QueryAllAllianceValidatorsRequest](#alliance.alliance.QueryAllAllianceValidatorsRequest) | [QueryAllianceValidatorsResponse](#alliance.alliance.QueryAllianceValidatorsResponse) | Query all paginated alliance validators | GET|/terra/alliances/validators|
11701115
| `AlliancesDelegation` | [QueryAlliancesDelegationsRequest](#alliance.alliance.QueryAlliancesDelegationsRequest) | [QueryAlliancesDelegationsResponse](#alliance.alliance.QueryAlliancesDelegationsResponse) | Query all paginated alliance delegations for a delegator addr | GET|/terra/alliances/delegations/{delegator_addr}|
11711116
| `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}|
11721117
| `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}|
11741118
| `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}|
1175-
| `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}|
11761119
| `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}|
11771120
| `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}|
11781121
| `AllianceRedelegations` | [QueryAllianceRedelegationsRequest](#alliance.alliance.QueryAllianceRedelegationsRequest) | [QueryAllianceRedelegationsResponse](#alliance.alliance.QueryAllianceRedelegationsResponse) | Query redelegations by denom and delegator address | GET|/terra/alliances/redelegations/{denom}/{delegator_addr}|

‎proto/alliance/alliance/query.proto‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@ service Query {
2323
option (google.api.http).get = "/terra/alliances";
2424
}
2525

26-
// Query a specific alliance by ibc hash
27-
// @deprecated: this endpoint will be replaced for by the encoded version
28-
// of the denom e.g.: GET:/terra/alliances/ibc%2Falliance
29-
rpc IBCAlliance(QueryIBCAllianceRequest) returns (QueryAllianceResponse) {
30-
// Deprecated. Please use the default endpoint
31-
// with the encoded denom e.g from ibc/alliance to ibc%2Falliance
32-
option deprecated = true;
33-
option (google.api.http).get = "/terra/alliances/ibc/{hash}";
34-
}
35-
3626
// Query all paginated alliance delegations
3727
rpc AllAlliancesDelegations(QueryAllAlliancesDelegationsRequest) returns (QueryAlliancesDelegationsResponse) {
3828
option (google.api.http).get = "/terra/alliances/delegations";
@@ -63,29 +53,10 @@ service Query {
6353
option (google.api.http).get = "/terra/alliances/delegations/{delegator_addr}/{validator_addr}/{denom}";
6454
}
6555

66-
// Query a delegation to an alliance by delegator addr, validator_addr and denom
67-
// @deprecated: this endpoint will be replaced for by the encoded version
68-
// of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance
69-
rpc IBCAllianceDelegation(QueryIBCAllianceDelegationRequest) returns (QueryAllianceDelegationResponse) {
70-
// Deprecated. Please use the default endpoint
71-
// with the encoded denom e.g from ibc/alliance to ibc%2Falliance
72-
option deprecated = true;
73-
option (google.api.http).get = "/terra/alliances/delegations/{delegator_addr}/{validator_addr}/ibc/{hash}";
74-
}
75-
7656
// Query for rewards by delegator addr, validator_addr and denom
7757
rpc AllianceDelegationRewards(QueryAllianceDelegationRewardsRequest) returns (QueryAllianceDelegationRewardsResponse) {
7858
option (google.api.http).get = "/terra/alliances/rewards/{delegator_addr}/{validator_addr}/{denom}";
7959
}
80-
// Query for rewards by delegator addr, validator_addr and denom
81-
// @deprecated: this endpoint will be replaced for by the encoded version
82-
// of the denom e.g.: GET:/terra/alliances/terradr1231/terravaloper41234/ibc%2Falliance
83-
rpc IBCAllianceDelegationRewards(QueryIBCAllianceDelegationRewardsRequest) returns (QueryAllianceDelegationRewardsResponse) {
84-
// Deprecated. Please use the default endpoint
85-
// with the encoded denom e.g from ibc/alliance to ibc%2Falliance
86-
option deprecated = true;
87-
option (google.api.http).get = "/terra/alliances/rewards/{delegator_addr}/{validator_addr}/ibc/{hash}";
88-
}
8960

9061
// Query for rewards by delegator addr, validator_addr and denom
9162
rpc AllianceUnbondingsByDenomAndDelegator(QueryAllianceUnbondingsByDenomAndDelegatorRequest) returns (QueryAllianceUnbondingsByDenomAndDelegatorResponse) {
@@ -134,13 +105,6 @@ message QueryAllianceResponse {
134105
AllianceAsset alliance = 1;
135106
}
136107

137-
message QueryIBCAllianceRequest {
138-
// Deprecated. Please use the default endpoint
139-
// with the encoded denom e.g from
140-
option deprecated = true;
141-
string hash = 1;
142-
}
143-
144108
message QueryAllianceValidatorRequest {
145109
option (gogoproto.equal) = false;
146110
option (gogoproto.goproto_getters) = false;
@@ -207,19 +171,6 @@ message QueryAllianceDelegationRequest {
207171
cosmos.base.query.v1beta1.PageRequest pagination = 4;
208172
}
209173

210-
message QueryIBCAllianceDelegationRequest {
211-
// Deprecated. Please use the default endpoint
212-
// with the encoded denom e.g from
213-
option deprecated = true;
214-
option (gogoproto.equal) = false;
215-
option (gogoproto.goproto_getters) = false;
216-
217-
string delegator_addr = 1;
218-
string validator_addr = 2;
219-
string hash = 3;
220-
cosmos.base.query.v1beta1.PageRequest pagination = 4;
221-
}
222-
223174
message QueryAllianceDelegationResponse {
224175
DelegationResponse delegation = 1 [(gogoproto.nullable) = false];
225176
}
@@ -235,19 +186,6 @@ message QueryAllianceDelegationRewardsRequest {
235186
cosmos.base.query.v1beta1.PageRequest pagination = 4;
236187
}
237188

238-
message QueryIBCAllianceDelegationRewardsRequest {
239-
// Deprecated. Please use the default endpoint
240-
// with the encoded denom e.g from
241-
option deprecated = true;
242-
option (gogoproto.equal) = false;
243-
option (gogoproto.goproto_getters) = false;
244-
245-
string delegator_addr = 1;
246-
string validator_addr = 2;
247-
string hash = 3;
248-
cosmos.base.query.v1beta1.PageRequest pagination = 4;
249-
}
250-
251189
message QueryAllianceDelegationRewardsResponse {
252190
option (gogoproto.equal) = false;
253191
option (gogoproto.goproto_getters) = false;

‎x/alliance/keeper/grpc_query.go‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,6 @@ func (k QueryServer) Alliance(c context.Context, req *types.QueryAllianceRequest
221221
}, nil
222222
}
223223

224-
func (k QueryServer) IBCAlliance(c context.Context, request *types.QueryIBCAllianceRequest) (*types.QueryAllianceResponse, error) { //nolint:staticcheck // SA1019: types.QueryIBCAllianceRequest is deprecated
225-
req := types.QueryAllianceRequest{
226-
Denom: "ibc/" + request.Hash,
227-
}
228-
return k.Alliance(c, &req)
229-
}
230-
231224
func (k QueryServer) AllianceDelegationRewards(context context.Context, req *types.QueryAllianceDelegationRewardsRequest) (*types.QueryAllianceDelegationRewardsResponse, error) {
232225
ctx := sdk.UnwrapSDKContext(context)
233226
decodedDenom, err := url.QueryUnescape(req.Denom)
@@ -266,17 +259,6 @@ func (k QueryServer) AllianceDelegationRewards(context context.Context, req *typ
266259
}, nil
267260
}
268261

269-
func (k QueryServer) IBCAllianceDelegationRewards(context context.Context, request *types.QueryIBCAllianceDelegationRewardsRequest) (*types.QueryAllianceDelegationRewardsResponse, error) { //nolint:staticcheck // SA1019: types.QueryIBCAllianceDelegationRewardsRequest is deprecated
270-
req := types.QueryAllianceDelegationRewardsRequest{
271-
DelegatorAddr: request.DelegatorAddr,
272-
ValidatorAddr: request.ValidatorAddr,
273-
Denom: "ibc/" + request.Hash,
274-
Pagination: request.Pagination,
275-
}
276-
277-
return k.AllianceDelegationRewards(context, &req)
278-
}
279-
280262
func (k QueryServer) AlliancesDelegation(c context.Context, req *types.QueryAlliancesDelegationsRequest) (*types.QueryAlliancesDelegationsResponse, error) {
281263
var delegationsRes []types.DelegationResponse
282264

@@ -542,16 +524,6 @@ func (k QueryServer) AllianceRedelegations(c context.Context, req *types.QueryAl
542524
}, err
543525
}
544526

545-
func (k QueryServer) IBCAllianceDelegation(c context.Context, request *types.QueryIBCAllianceDelegationRequest) (*types.QueryAllianceDelegationResponse, error) { //nolint:staticcheck // SA1019: types.QueryIBCAllianceDelegationRequest is deprecated
546-
req := types.QueryAllianceDelegationRequest{
547-
DelegatorAddr: request.DelegatorAddr,
548-
ValidatorAddr: request.ValidatorAddr,
549-
Denom: "ibc/" + request.Hash,
550-
Pagination: request.Pagination,
551-
}
552-
return k.AllianceDelegation(c, &req)
553-
}
554-
555527
func NewQueryServerImpl(keeper Keeper) types.QueryServer {
556528
return &QueryServer{
557529
Keeper: keeper,

‎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: math.LegacyNewDec(10),
187-
RewardWeightRange: types.RewardWeightRange{Min: math.LegacyNewDec(2), Max: math.LegacyNewDec(12)},
188-
TakeRate: math.LegacyMustNewDecFromStr("0.14159265359"),
189-
TotalTokens: math.ZeroInt(),
190-
TotalValidatorShares: math.LegacyNewDec(0),
191-
RewardChangeRate: math.LegacyNewDec(0),
192-
RewardChangeInterval: 0,
193-
},
194-
}, alliancesIbcEndpoint)
195178
}
196179

197180
func TestQueryAllianceNotFound(t *testing.T) {

0 commit comments

Comments
 (0)