Skip to content

Commit 347de3e

Browse files
dsseidssei
authored
Revert "Adding token factory specific denom endpoint" (#463)
Reverts sei-protocol/sei-cosmos#457 in favor of #1444 as tokenfactory is more appropriate module for the endpoint
1 parent f83505f commit 347de3e

File tree

7 files changed

+86
-472
lines changed

7 files changed

+86
-472
lines changed

‎sei-cosmos/go.mod‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,16 @@ require (
7878
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
7979
github.com/cosmos/gorocksdb v1.2.0 // indirect
8080
github.com/creachadair/taskgroup v0.3.2 // indirect
81+
github.com/danieljoos/wincred v1.1.2 // indirect
8182
github.com/davecgh/go-spew v1.1.1 // indirect
8283
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
8384
github.com/dgraph-io/badger/v3 v3.2103.2 // indirect
8485
github.com/dgraph-io/ristretto v0.1.1 // indirect
8586
github.com/dustin/go-humanize v1.0.1 // indirect
87+
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
8688
github.com/felixge/httpsnoop v1.0.1 // indirect
8789
github.com/fsnotify/fsnotify v1.6.0 // indirect
90+
github.com/gin-gonic/gin v1.7.7 // indirect
8891
github.com/go-kit/kit v0.12.0 // indirect
8992
github.com/go-kit/log v0.2.1 // indirect
9093
github.com/go-logfmt/logfmt v0.5.1 // indirect
@@ -94,8 +97,10 @@ require (
9497
github.com/golang/glog v1.1.0 // indirect
9598
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9699
github.com/golang/snappy v0.0.4 // indirect
100+
github.com/google/btree v1.1.2 // indirect
97101
github.com/google/flatbuffers v1.12.1 // indirect
98102
github.com/google/go-cmp v0.5.9 // indirect
103+
github.com/google/gofuzz v1.2.0 // indirect
99104
github.com/google/orderedcode v0.0.1 // indirect
100105
github.com/google/uuid v1.3.0 // indirect
101106
github.com/gorilla/websocket v1.5.0 // indirect
@@ -121,6 +126,7 @@ require (
121126
github.com/mtibben/percent v0.2.1 // indirect
122127
github.com/oasisprotocol/curve25519-voi v0.0.0-20210609091139-0a56a4bca00b // indirect
123128
github.com/pelletier/go-toml v1.9.5 // indirect
129+
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
124130
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
125131
github.com/pmezard/go-difflib v1.0.0 // indirect
126132
github.com/prometheus/client_model v0.3.0 // indirect
@@ -144,11 +150,13 @@ require (
144150
go.opencensus.io v0.23.0 // indirect
145151
golang.org/x/mod v0.11.0 // indirect
146152
golang.org/x/net v0.17.0 // indirect
153+
golang.org/x/sync v0.4.0 // indirect
147154
golang.org/x/sys v0.13.0 // indirect
148155
golang.org/x/term v0.13.0 // indirect
149156
golang.org/x/text v0.13.0 // indirect
150157
golang.org/x/tools v0.6.0 // indirect
151158
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
159+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect
152160
gopkg.in/ini.v1 v1.67.0 // indirect
153161
gopkg.in/yaml.v3 v3.0.1 // indirect
154162
lukechampine.com/uint128 v1.2.0 // indirect
@@ -164,17 +172,6 @@ require (
164172
nhooyr.io/websocket v1.8.6 // indirect
165173
)
166174

167-
require (
168-
github.com/danieljoos/wincred v1.1.2 // indirect
169-
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
170-
github.com/gin-gonic/gin v1.7.7 // indirect
171-
github.com/google/btree v1.1.2
172-
github.com/google/gofuzz v1.2.0 // indirect
173-
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
174-
golang.org/x/sync v0.4.0 // indirect
175-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect
176-
)
177-
178175
replace (
179176
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
180177
github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0

‎sei-cosmos/proto/cosmos/bank/v1beta1/query.proto‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ service Query {
4747
option (google.api.http).get = "/cosmos/bank/v1beta1/denoms_metadata/{denom}";
4848
}
4949

50-
// TokenFactoryDenomMetadata queries the client metadata of a given token factory coin denomination.
51-
rpc TokenFactoryDenomMetadata(QueryTokenFactoryDenomMetadataRequest) returns (QueryDenomMetadataResponse) {
52-
option (google.api.http).get = "/cosmos/bank/v1beta1/token_factory/denoms_metadata";
53-
}
54-
5550
// DenomsMetadata queries the client metadata for all registered coin denominations.
5651
rpc DenomsMetadata(QueryDenomsMetadataRequest) returns (QueryDenomsMetadataResponse) {
5752
option (google.api.http).get = "/cosmos/bank/v1beta1/denoms_metadata";
@@ -190,12 +185,6 @@ message QueryDenomMetadataRequest {
190185
string denom = 1;
191186
}
192187

193-
// QueryTokenFactoryDenomMetadataRequest is the request type for the Query/TokenFactoryDenomMetadata RPC method.
194-
message QueryTokenFactoryDenomMetadataRequest {
195-
// denom is the (token factory) coin denom to query the metadata for.
196-
string denom = 1;
197-
}
198-
199188
// QueryDenomMetadataResponse is the response type for the Query/DenomMetadata RPC
200189
// method.
201190
message QueryDenomMetadataResponse {

‎sei-cosmos/x/bank/keeper/grpc_query.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,3 @@ func (k BaseKeeper) DenomMetadata(c context.Context, req *types.QueryDenomMetada
200200
Metadata: metadata,
201201
}, nil
202202
}
203-
204-
// TokenFactoryDenomMetadata implements Query/TokenFactoryDenomMetadata gRPC method.
205-
func (k BaseKeeper) TokenFactoryDenomMetadata(c context.Context, req *types.QueryTokenFactoryDenomMetadataRequest) (*types.QueryDenomMetadataResponse, error) {
206-
return k.DenomMetadata(c, &types.QueryDenomMetadataRequest{Denom: req.Denom})
207-
}

‎sei-cosmos/x/bank/keeper/grpc_query_test.go‎

Lines changed: 4 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ func (suite *IntegrationTestSuite) TestQueryParams() {
180180
suite.Require().Equal(suite.app.BankKeeper.GetParams(suite.ctx), res.GetParams())
181181
}
182182

183-
func (suite *IntegrationTestSuite) TestQueryDenomsMetadataRequest() {
183+
func (suite *IntegrationTestSuite) QueryDenomsMetadataRequest() {
184184
var (
185185
req *types.QueryDenomsMetadataRequest
186-
expMetadata []types.Metadata
186+
expMetadata = []types.Metadata{}
187187
)
188188

189189
testCases := []struct {
@@ -282,7 +282,7 @@ func (suite *IntegrationTestSuite) TestQueryDenomsMetadataRequest() {
282282
}
283283
}
284284

285-
func (suite *IntegrationTestSuite) TestQueryDenomMetadataRequest() {
285+
func (suite *IntegrationTestSuite) QueryDenomMetadataRequest() {
286286
var (
287287
req *types.QueryDenomMetadataRequest
288288
expMetadata = types.Metadata{}
@@ -312,7 +312,7 @@ func (suite *IntegrationTestSuite) TestQueryDenomMetadataRequest() {
312312
{
313313
"success",
314314
func() {
315-
expMetadata = types.Metadata{
315+
expMetadata := types.Metadata{
316316
Description: "The native staking token of the Cosmos Hub.",
317317
DenomUnits: []*types.DenomUnit{
318318
{
@@ -358,76 +358,3 @@ func (suite *IntegrationTestSuite) TestQueryDenomMetadataRequest() {
358358
})
359359
}
360360
}
361-
362-
func (suite *IntegrationTestSuite) TestQueryTokenFactoryDenomMetadataRequest() {
363-
var (
364-
req *types.QueryTokenFactoryDenomMetadataRequest
365-
expMetadata = types.Metadata{}
366-
)
367-
tokenFactoryDenom := "factory/sei1gxskuzvhr4s8sdm2rpruaf7yx2dnmjn0zfdu9q/NEWCOIN"
368-
testCases := []struct {
369-
msg string
370-
malleate func()
371-
expPass bool
372-
}{
373-
{
374-
"empty denom",
375-
func() {
376-
req = &types.QueryTokenFactoryDenomMetadataRequest{}
377-
},
378-
false,
379-
},
380-
{
381-
"not found denom",
382-
func() {
383-
req = &types.QueryTokenFactoryDenomMetadataRequest{
384-
Denom: tokenFactoryDenom,
385-
}
386-
},
387-
false,
388-
},
389-
{
390-
"success",
391-
func() {
392-
393-
expMetadata = types.Metadata{
394-
Description: "Token factory custom token",
395-
DenomUnits: []*types.DenomUnit{
396-
{
397-
Denom: tokenFactoryDenom,
398-
Exponent: 0,
399-
Aliases: []string{tokenFactoryDenom},
400-
},
401-
},
402-
Base: tokenFactoryDenom,
403-
Display: tokenFactoryDenom,
404-
}
405-
406-
suite.app.BankKeeper.SetDenomMetaData(suite.ctx, expMetadata)
407-
req = &types.QueryTokenFactoryDenomMetadataRequest{
408-
Denom: expMetadata.Base,
409-
}
410-
},
411-
true,
412-
},
413-
}
414-
415-
for _, tc := range testCases {
416-
suite.Run(fmt.Sprintf("Case %s", tc.msg), func() {
417-
suite.SetupTest() // reset
418-
419-
tc.malleate()
420-
ctx := sdk.WrapSDKContext(suite.ctx)
421-
422-
res, err := suite.queryClient.TokenFactoryDenomMetadata(ctx, req)
423-
424-
if tc.expPass {
425-
suite.Require().NoError(err)
426-
suite.Require().NotNil(res)
427-
suite.Require().Equal(expMetadata, res.Metadata)
428-
} else {
429-
suite.Require().Error(err)
430-
}
431-
})
432-
}
433-
}

0 commit comments

Comments
 (0)