diff --git a/go.mod b/go.mod index e9ddc776..1ba6cb27 100644 --- a/go.mod +++ b/go.mod @@ -42,10 +42,10 @@ require ( github.com/tendermint/tm-db v0.6.7 github.com/tyler-smith/go-bip39 v1.1.0 github.com/vektah/gqlparser/v2 v2.5.1 - golang.org/x/net v0.0.0-20220909164309-bea034e7d591 - golang.org/x/text v0.3.7 - google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a - google.golang.org/grpc v1.50.0 + golang.org/x/net v0.1.0 + golang.org/x/text v0.4.0 + google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e + google.golang.org/grpc v1.50.1 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v3 v3.0.1 sigs.k8s.io/yaml v1.3.0 @@ -194,14 +194,14 @@ require ( github.com/zondax/hid v0.9.1-0.20220302062450-5552068d2266 // indirect go.etcd.io/bbolt v1.3.6 // indirect go.opencensus.io v0.23.0 // indirect - golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect + golang.org/x/crypto v0.1.0 // indirect golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect - golang.org/x/sys v0.0.0-20220908150016-7ac13a9a928d // indirect - golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect + golang.org/x/sys v0.1.0 // indirect + golang.org/x/term v0.1.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.97.0 // indirect + google.golang.org/api v0.93.0 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect diff --git a/go.sum b/go.sum index a660949a..fc83656e 100644 --- a/go.sum +++ b/go.sum @@ -1202,8 +1202,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0= -golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1312,8 +1312,8 @@ golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI= -golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1334,7 +1334,7 @@ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= -golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 h1:lxqLZaMad/dJHMFZH0NiNpiEZI/nhgWhe4wgzpE+MuA= golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1455,16 +1455,16 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908150016-7ac13a9a928d h1:RoyzQTK76Rktm3p4xyZslc8T8I1tBz4UEjZCzeh57mM= -golang.org/x/sys v0.0.0-20220908150016-7ac13a9a928d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= -golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1473,8 +1473,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1602,8 +1603,8 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.97.0 h1:x/vEL1XDF/2V4xzdNgFPaKHluRESo2aTsL7QzHnBtGQ= -google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= +google.golang.org/api v0.93.0 h1:T2xt9gi0gHdxdnRkVQhT8mIvPaXKNsDNWz+L696M66M= +google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1702,8 +1703,8 @@ google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljW google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= -google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a h1:GH6UPn3ixhWcKDhpnEC55S75cerLPdpp3hrhfKYjZgw= -google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= +google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y= +google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1742,8 +1743,8 @@ google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11 google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU= -google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY= +google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/x/bond/client/testutil/grpc.go b/x/bond/client/testutil/grpc.go index df0e20d9..b6d464da 100644 --- a/x/bond/client/testutil/grpc.go +++ b/x/bond/client/testutil/grpc.go @@ -162,7 +162,7 @@ func (s *IntegrationTestSuite) TestGRPCGetBondByID() { // extract bond id from bonds list bond := queryResponse.GetBonds()[0] - return bond.GetID() + return bond.GetId() }, }, } @@ -181,11 +181,11 @@ func (s *IntegrationTestSuite) TestGRPCGetBondByID() { err = val.ClientCtx.Codec.UnmarshalJSON(resp, &bonds) if tc.expErr { - sr.Empty(bonds.GetBond().GetID()) + sr.Empty(bonds.GetBond().GetId()) } else { sr.NoError(err) - sr.NotZero(bonds.GetBond().GetID()) - sr.Equal(bonds.GetBond().GetID(), bondID) + sr.NotZero(bonds.GetBond().GetId()) + sr.Equal(bonds.GetBond().GetId(), bondID) } }) } diff --git a/x/bond/client/testutil/query.go b/x/bond/client/testutil/query.go index c726a309..1d3f8159 100644 --- a/x/bond/client/testutil/query.go +++ b/x/bond/client/testutil/query.go @@ -205,7 +205,7 @@ func (s *IntegrationTestSuite) TestGetQueryBondByID() { // extract bond id from bonds list bond := queryResponse.GetBonds()[0] - return bond.GetID() + return bond.GetId() }, }, } @@ -225,9 +225,9 @@ func (s *IntegrationTestSuite) TestGetQueryBondByID() { err = clientCtx.Codec.UnmarshalJSON(out.Bytes(), &queryResponse) sr.NoError(err) if tc.err { - sr.Zero(len(queryResponse.GetBond().GetID())) + sr.Zero(len(queryResponse.GetBond().GetId())) } else { - sr.NotZero(len(queryResponse.GetBond().GetID())) + sr.NotZero(len(queryResponse.GetBond().GetId())) sr.Equal(s.accountAddress, queryResponse.GetBond().GetOwner()) } }) diff --git a/x/bond/client/testutil/tx.go b/x/bond/client/testutil/tx.go index a43c34b9..c023f4c7 100644 --- a/x/bond/client/testutil/tx.go +++ b/x/bond/client/testutil/tx.go @@ -118,7 +118,7 @@ func (s *IntegrationTestSuite) TestTxRefillBond() { // extract bond id from bonds list bond := queryResponse.GetBonds()[0] - tc.args = append([]string{bond.GetID()}, tc.args...) + tc.args = append([]string{bond.GetId()}, tc.args...) } out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args) if tc.err { @@ -204,7 +204,7 @@ func (s *IntegrationTestSuite) TestTxWithdrawAmountFromBond() { // extract bond id from bonds list bond := queryResponse.GetBonds()[0] - tc.args = append([]string{bond.GetID()}, tc.args...) + tc.args = append([]string{bond.GetId()}, tc.args...) } out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args) if tc.err { @@ -288,7 +288,7 @@ func (s *IntegrationTestSuite) TestTxCancelBond() { // extract bond id from bonds list bond := queryResponse.GetBonds()[0] - tc.args = append([]string{bond.GetID()}, tc.args...) + tc.args = append([]string{bond.GetId()}, tc.args...) } out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args) if tc.err { @@ -312,7 +312,7 @@ func (s *IntegrationTestSuite) TestTxCancelBond() { err = clientCtx.Codec.UnmarshalJSON(out.Bytes(), &queryResponse) sr.NoError(err) - sr.Zero(queryResponse.GetBond().GetID()) + sr.Zero(queryResponse.GetBond().GetId()) } }) } diff --git a/x/bond/keeper/grpc_query.go b/x/bond/keeper/grpc_query.go index dba329af..0742bc5a 100644 --- a/x/bond/keeper/grpc_query.go +++ b/x/bond/keeper/grpc_query.go @@ -28,11 +28,11 @@ func (q Querier) Params(c context.Context, _ *types.QueryParamsRequest) (*types. func (q Querier) GetBondByID(c context.Context, req *types.QueryGetBondByIDRequest) (*types.QueryGetBondByIDResponse, error) { ctx := sdk.UnwrapSDKContext(c) - bondID := req.GetID() + bondID := req.GetId() if len(bondID) == 0 { return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "bond id required") } - bond := q.Keeper.GetBond(ctx, req.GetID()) + bond := q.Keeper.GetBond(ctx, req.GetId()) return &types.QueryGetBondByIDResponse{Bond: &bond}, nil } diff --git a/x/bond/keeper/grpc_query_test.go b/x/bond/keeper/grpc_query_test.go index 56d51ead..300a471d 100644 --- a/x/bond/keeper/grpc_query_test.go +++ b/x/bond/keeper/grpc_query_test.go @@ -124,7 +124,7 @@ func (suite *KeeperTestSuite) TestGrpcQueryBondBondId() { if !test.errResponse { suiteRequire.Nil(err) suiteRequire.NotNil(resp.GetBond()) - suiteRequire.Equal(test.req.Id, resp.GetBond().GetID()) + suiteRequire.Equal(test.req.Id, resp.GetBond().GetId()) } else { suiteRequire.NotNil(err) suiteRequire.Error(err) diff --git a/x/bond/types/bond.pb.go b/x/bond/types/bond.pb.go index 3fc0ae62..f078d51c 100644 --- a/x/bond/types/bond.pb.go +++ b/x/bond/types/bond.pb.go @@ -114,7 +114,7 @@ func (m *Bond) XXX_DiscardUnknown() { var xxx_messageInfo_Bond proto.InternalMessageInfo -func (m *Bond) GetID() string { +func (m *Bond) GetId() string { if m != nil { return m.Id } diff --git a/x/bond/types/query.pb.go b/x/bond/types/query.pb.go index 2a075f04..bb7faa60 100644 --- a/x/bond/types/query.pb.go +++ b/x/bond/types/query.pb.go @@ -252,7 +252,7 @@ func (m *QueryGetBondByIDRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryGetBondByIDRequest proto.InternalMessageInfo -func (m *QueryGetBondByIDRequest) GetID() string { +func (m *QueryGetBondByIDRequest) GetId() string { if m != nil { return m.Id } diff --git a/x/nameservice/client/testutil/grpc.go b/x/nameservice/client/testutil/grpc.go index 485e6329..86fcc7fc 100644 --- a/x/nameservice/client/testutil/grpc.go +++ b/x/nameservice/client/testutil/grpc.go @@ -457,8 +457,8 @@ func (s *IntegrationTestSuite) TestGRPCQueryGetRecordByID() { err := val.ClientCtx.Codec.UnmarshalJSON(resp, &response) sr.NoError(err) record := response.GetRecord() - sr.NotZero(len(record.GetID())) - sr.Equal(record.GetID(), recordID) + sr.NotZero(len(record.GetId())) + sr.Equal(record.GetId(), recordID) } }) } diff --git a/x/nameservice/client/testutil/tx.go b/x/nameservice/client/testutil/tx.go index 1baafa16..60102073 100644 --- a/x/nameservice/client/testutil/tx.go +++ b/x/nameservice/client/testutil/tx.go @@ -153,7 +153,7 @@ func GetBondID(s *IntegrationTestSuite) string { // extract bond id from bonds list bond := queryResponse.GetBonds()[0] - return bond.GetID() + return bond.GetId() } func (s *IntegrationTestSuite) TestGetCmdSetRecord() { diff --git a/x/nameservice/keeper/grpc_query_test.go b/x/nameservice/keeper/grpc_query_test.go index 8ca384c3..1387c507 100644 --- a/x/nameservice/keeper/grpc_query_test.go +++ b/x/nameservice/keeper/grpc_query_test.go @@ -66,7 +66,7 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() { payload, err := payloadType.ToPayload() sr.NoError(err) record, err := suite.app.NameServiceKeeper.ProcessSetRecord(ctx, nameservicetypes.MsgSetRecord{ - BondId: suite.bond.GetID(), + BondId: suite.bond.GetId(), Signer: suite.accounts[0].String(), Payload: payload, }) @@ -80,9 +80,9 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() { sr.NoError(err) sr.Equal(test.noOfRecords, len(resp.GetRecords())) if test.createRecord { - recordId = resp.GetRecords()[0].GetID() + recordId = resp.GetRecords()[0].GetId() sr.NotZero(resp.GetRecords()) - sr.Equal(resp.GetRecords()[0].GetBondId(), suite.bond.GetID()) + sr.Equal(resp.GetRecords()[0].GetBondId(), suite.bond.GetId()) } } }) @@ -122,7 +122,7 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() { sr.NoError(err) sr.NotNil(resp.GetRecord()) if test.createRecord { - sr.Equal(resp.GetRecord().BondId, suite.bond.GetID()) + sr.Equal(resp.GetRecord().BondId, suite.bond.GetId()) sr.Equal(resp.GetRecord().Id, recordId) } } @@ -147,7 +147,7 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() { { "With Bond ID", &nameservicetypes.QueryRecordByBondIDRequest{ - Id: suite.bond.GetID(), + Id: suite.bond.GetId(), }, true, false, @@ -164,7 +164,7 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() { sr.NotNil(resp.GetRecords()) if test.createRecord { sr.NotZero(resp.GetRecords()) - sr.Equal(resp.GetRecords()[0].GetBondId(), suite.bond.GetID()) + sr.Equal(resp.GetRecords()[0].GetBondId(), suite.bond.GetId()) } } }) @@ -199,7 +199,7 @@ func (suite *KeeperTestSuite) TestGrpcQueryNameserviceModuleBalance() { payload, err := payloadType.ToPayload() sr.NoError(err) record, err := suite.app.NameServiceKeeper.ProcessSetRecord(ctx, nameservicetypes.MsgSetRecord{ - BondId: suite.bond.GetID(), + BondId: suite.bond.GetId(), Signer: suite.accounts[0].String(), Payload: payload, }) diff --git a/x/nameservice/keeper/keeper.go b/x/nameservice/keeper/keeper.go index 338e185f..7eec6288 100644 --- a/x/nameservice/keeper/keeper.go +++ b/x/nameservice/keeper/keeper.go @@ -187,6 +187,7 @@ func contains(arr []string, str string) bool { } return false } + func (k Keeper) GetRecordExpiryQueue(ctx sdk.Context) []*types.ExpiryQueueRecord { var records []*types.ExpiryQueueRecord @@ -292,7 +293,6 @@ func (k Keeper) PutRecord(ctx sdk.Context, record types.Record) { } func (k Keeper) ProcessAttributes(ctx sdk.Context, record types.RecordType) error { - switch record.Attributes["type"] { case "ServiceProviderRegistration": { @@ -326,7 +326,9 @@ func (k Keeper) ProcessAttributes(ctx sdk.Context, record types.RecordType) erro } expiryTimeKey := GetAttributesIndexKey(ExpiryTimeAttributeName, record.ExpiryTime) - k.SetAttributeMapping(ctx, expiryTimeKey, record.ID) + if err := k.SetAttributeMapping(ctx, expiryTimeKey, record.ID); err != nil { + return err + } return nil } @@ -336,7 +338,7 @@ func GetAttributesIndexKey(key string, value interface{}) []byte { return append(PrefixAttributesIndex, []byte(keyString)...) } -func (k Keeper) SetAttributeMapping(ctx sdk.Context, key []byte, recordId string) error { +func (k Keeper) SetAttributeMapping(ctx sdk.Context, key []byte, recordID string) error { store := ctx.KVStore(k.storeKey) var recordIds []string if store.Has(key) { @@ -347,7 +349,7 @@ func (k Keeper) SetAttributeMapping(ctx sdk.Context, key []byte, recordId string } else { recordIds = []string{} } - recordIds = append(recordIds, recordId) + recordIds = append(recordIds, recordID) bz, err := json.Marshal(recordIds) if err != nil { return fmt.Errorf("cannot marshal string array, error, %w", err) @@ -369,7 +371,6 @@ func (k Keeper) GetAttributeMapping(ctx sdk.Context, key []byte) ([]string, erro } return recordIds, nil - } // AddBondToRecordIndexEntry adds the Bond ID -> [Record] index entry. diff --git a/x/nameservice/types/nameservice.pb.go b/x/nameservice/types/nameservice.pb.go index 4ff980bb..9ea2d928 100644 --- a/x/nameservice/types/nameservice.pb.go +++ b/x/nameservice/types/nameservice.pb.go @@ -201,7 +201,7 @@ func (m *Record) XXX_DiscardUnknown() { var xxx_messageInfo_Record proto.InternalMessageInfo -func (m *Record) GetID() string { +func (m *Record) GetId() string { if m != nil { return m.Id } diff --git a/x/nameservice/types/query.pb.go b/x/nameservice/types/query.pb.go index d91f3dc9..0fc272f6 100644 --- a/x/nameservice/types/query.pb.go +++ b/x/nameservice/types/query.pb.go @@ -421,13 +421,8 @@ func (m *QueryListRecordsResponse) GetPagination() *query.PageResponse { return nil } -<<<<<<< HEAD -// QueryRecordByIdRequest is request type for nameservice records by id -type QueryRecordByIdRequest struct { -======= // QueryRecordByIDRequest is request type for nameservice records by id type QueryRecordByIDRequest struct { ->>>>>>> origin Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } diff --git a/x/nameservice/types/types.go b/x/nameservice/types/types.go index 94d48972..8582a92b 100644 --- a/x/nameservice/types/types.go +++ b/x/nameservice/types/types.go @@ -2,12 +2,12 @@ package types import ( "crypto/sha256" + "encoding/json" "fmt" "github.com/cerc-io/laconicd/x/nameservice/helpers" codectypes "github.com/cosmos/cosmos-sdk/codec/types" canonicalJson "github.com/gibson042/canonicaljson-go" - "github.com/golang/protobuf/proto" ) const ( @@ -25,13 +25,11 @@ type PayloadType struct { // ToPayload converts PayloadType to Payload object. // Why? Because go-amino can't handle maps: https://github.com/tendermint/go-amino/issues/4. func (payloadObj *PayloadType) ToPayload() (Payload, error) { - attributes, err := payLoadAttributes(payloadObj.Record) if err != nil { return Payload{}, err } - - var payload = Payload{ + payload := Payload{ Record: &Record{ Deleted: false, Owners: nil, @@ -43,7 +41,6 @@ func (payloadObj *PayloadType) ToPayload() (Payload, error) { } func payLoadAttributes(recordPayLoad map[string]interface{}) (*codectypes.Any, error) { - recordType, ok := recordPayLoad["Type"] if !ok { return &codectypes.Any{}, fmt.Errorf("cannot get type from payload") @@ -54,7 +51,7 @@ func payLoadAttributes(recordPayLoad map[string]interface{}) (*codectypes.Any, e case "ServiceProviderRegistration": { var attributes ServiceProviderRegistration - err := proto.Unmarshal(bz, &attributes) + err := json.Unmarshal(bz, &attributes) if err != nil { return &codectypes.Any{}, err } @@ -63,7 +60,7 @@ func payLoadAttributes(recordPayLoad map[string]interface{}) (*codectypes.Any, e case "WebsiteRegistrationRecord": { var attributes WebsiteRegistrationRecord - err := proto.Unmarshal(bz, &attributes) + err := json.Unmarshal(bz, &attributes) if err != nil { return &codectypes.Any{}, err } @@ -72,7 +69,6 @@ func payLoadAttributes(recordPayLoad map[string]interface{}) (*codectypes.Any, e default: return &codectypes.Any{}, fmt.Errorf("unsupported record type %s", recordType.(string)) } - } // ToReadablePayload converts Payload to PayloadType