Skip to content

Commit a6bf50d

Browse files
authored
bump SDK dependency (#367)
* update SDK dependency and fix changes Removes tests from sdk_test.go which are no longer needed to upstream changes in the SDK Fixes client_test.go due to inclusion of the fee in tx events * bump SDK version to v0.44.0
1 parent 9d5da17 commit a6bf50d

File tree

4 files changed

+5
-65
lines changed

4 files changed

+5
-65
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alp
77
require (
88
github.com/armon/go-metrics v0.3.9
99
github.com/confio/ics23/go v0.6.6
10-
github.com/cosmos/cosmos-sdk v0.43.0
10+
github.com/cosmos/cosmos-sdk v0.44.0
1111
github.com/gogo/protobuf v1.3.3
1212
github.com/golang/protobuf v1.5.2
1313
github.com/gorilla/mux v1.8.0

go.sum

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
165165
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
166166
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
167167
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
168-
github.com/cosmos/cosmos-sdk v0.43.0 h1:l2GXJMDVtJyHb35pDUCw+uyr6eZtBo8vt+7PSsq+Fjo=
169-
github.com/cosmos/cosmos-sdk v0.43.0/go.mod h1:ctcrTEAhei9s8O3KSNvL0dxe+fVQGp07QyRb/7H9JYE=
168+
github.com/cosmos/cosmos-sdk v0.44.0 h1:eOSjACNtTnThEJ62IsS+pMm3OIU6hgMVqrp4TZClLZo=
169+
github.com/cosmos/cosmos-sdk v0.44.0/go.mod h1:orG0jzFJ2KsDfzLd/X0JSOMzF4Oxc/BQz2GkcYF4gRE=
170170
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
171171
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
172172
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
@@ -771,7 +771,6 @@ github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxm
771771
github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg=
772772
github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ=
773773
github.com/tendermint/tendermint v0.34.10/go.mod h1:aeHL7alPh4uTBIJQ8mgFEE8VwJLXI1VD3rVOmH2Mcy0=
774-
github.com/tendermint/tendermint v0.34.11/go.mod h1:aeHL7alPh4uTBIJQ8mgFEE8VwJLXI1VD3rVOmH2Mcy0=
775774
github.com/tendermint/tendermint v0.34.12 h1:m+kUYNhONedhJfHmHG8lqsdZvbR5t6vmhaok1yXjpKg=
776775
github.com/tendermint/tendermint v0.34.12/go.mod h1:aeHL7alPh4uTBIJQ8mgFEE8VwJLXI1VD3rVOmH2Mcy0=
777776
github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI=

modules/core/02-client/keeper/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,8 @@ func (suite *KeeperTestSuite) TestUpdateClientEventEmission() {
678678

679679
result, err := suite.chainA.SendMsgs(msg)
680680
suite.Require().NoError(err)
681-
// first event type is "message", followed by 2 "tx" events in ante
682-
updateEvent := result.Events[3]
681+
// first event type is "message", followed by 3 "tx" events in ante
682+
updateEvent := result.Events[4]
683683
suite.Require().Equal(clienttypes.EventTypeUpdateClient, updateEvent.Type)
684684

685685
// use a boolean to ensure the update event contains the header

testing/sdk_test.go

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -126,65 +126,6 @@ func (s *IntegrationTestSuite) TearDownSuite() {
126126
s.network.Cleanup()
127127
}
128128

129-
// Create an IBC tx that's encoded as amino-JSON. Since we can't amino-marshal
130-
// a tx with "cosmos-sdk/MsgTransfer" using the SDK, we just hardcode the tx
131-
// here. But external clients might, see https://github.com/cosmos/cosmos-sdk/issues/8022.
132-
func mkIBCStdTx() []byte {
133-
ibcTx := `{
134-
"account_number": "68",
135-
"chain_id": "stargate-4",
136-
"fee": {
137-
"amount": [
138-
{
139-
"amount": "3500",
140-
"denom": "umuon"
141-
}
142-
],
143-
"gas": "350000"
144-
},
145-
"memo": "",
146-
"msg": [
147-
{
148-
"type": "cosmos-sdk/MsgTransfer",
149-
"value": {
150-
"receiver": "cosmos1q9wtnlwdjrhwtcjmt2uq77jrgx7z3usrq2yz7z",
151-
"sender": "cosmos1q9wtnlwdjrhwtcjmt2uq77jrgx7z3usrq2yz7z",
152-
"source_channel": "channel-0",
153-
"source_port": "transfer",
154-
"token": {
155-
"amount": "1000000",
156-
"denom": "umuon"
157-
}
158-
}
159-
}
160-
],
161-
"sequence": "24"
162-
}`
163-
req := fmt.Sprintf(`{"tx":%s,"mode":"async"}`, ibcTx)
164-
165-
return []byte(req)
166-
}
167-
168-
func (s *IntegrationTestSuite) TestEncodeIBCTx() {
169-
val := s.network.Validators[0]
170-
171-
req := mkIBCStdTx()
172-
res, err := rest.PostRequest(fmt.Sprintf("%s/txs/encode", val.APIAddress), "application/json", []byte(req))
173-
s.Require().NoError(err)
174-
175-
s.Require().Contains(string(res), authrest.ErrEncodeDecode.Error())
176-
}
177-
178-
func (s *IntegrationTestSuite) TestBroadcastIBCTxRequest() {
179-
val := s.network.Validators[0]
180-
181-
req := mkIBCStdTx()
182-
res, err := rest.PostRequest(fmt.Sprintf("%s/txs", val.APIAddress), "application/json", []byte(req))
183-
s.Require().NoError(err)
184-
185-
s.Require().NotContains(string(res), "this transaction cannot be broadcasted via legacy REST endpoints", string(res))
186-
}
187-
188129
// TestLegacyRestErrMessages creates two IBC txs, one that fails, one that
189130
// succeeds, and make sure we cannot query any of them (with pretty error msg).
190131
// Our intension is to test the error message of querying a message which is

0 commit comments

Comments
 (0)