LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix various linter warnings (#5824)

Browse Source
This commit is contained in:
Alessio Treglia
2020-03-18 12:59:08 +00:00
committed by GitHub
parent a84e02f390
commit 3db39cda3c
11 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/module/module_test.go
+6 -6
View File
@@ -179,8 +179,8 @@ func TestManager_InitGenesis(t *testing.T) {
genesisData = map[string]json.RawMessage{
"module1": json.RawMessage(`{"key": "value"}`),
"module2": json.RawMessage(`{"key": "value"}`)}
mockAppModule1.EXPECT().InitGenesis(gomock.Eq(ctx), gomock.Eq(cdc), gomock.Eq(genesisData["module1"])).Times(1).Return([]abci.ValidatorUpdate{abci.ValidatorUpdate{}})
mockAppModule2.EXPECT().InitGenesis(gomock.Eq(ctx), gomock.Eq(cdc), gomock.Eq(genesisData["module2"])).Times(1).Return([]abci.ValidatorUpdate{abci.ValidatorUpdate{}})
mockAppModule1.EXPECT().InitGenesis(gomock.Eq(ctx), gomock.Eq(cdc), gomock.Eq(genesisData["module1"])).Times(1).Return([]abci.ValidatorUpdate{{}})
mockAppModule2.EXPECT().InitGenesis(gomock.Eq(ctx), gomock.Eq(cdc), gomock.Eq(genesisData["module2"])).Times(1).Return([]abci.ValidatorUpdate{{}})
require.Panics(t, func() { mm.InitGenesis(ctx, cdc, genesisData) })
}
@@ -239,13 +239,13 @@ func TestManager_EndBlock(t *testing.T) {
req := abci.RequestEndBlock{Height: 10}
mockAppModule1.EXPECT().EndBlock(gomock.Any(), gomock.Eq(req)).Times(1).Return([]abci.ValidatorUpdate{abci.ValidatorUpdate{}})
mockAppModule1.EXPECT().EndBlock(gomock.Any(), gomock.Eq(req)).Times(1).Return([]abci.ValidatorUpdate{{}})
mockAppModule2.EXPECT().EndBlock(gomock.Any(), gomock.Eq(req)).Times(1)
ret := mm.EndBlock(sdk.Context{}, req)
require.Equal(t, []abci.ValidatorUpdate{abci.ValidatorUpdate{}}, ret.ValidatorUpdates)
require.Equal(t, []abci.ValidatorUpdate{{}}, ret.ValidatorUpdates)
// test panic
mockAppModule1.EXPECT().EndBlock(gomock.Any(), gomock.Eq(req)).Times(1).Return([]abci.ValidatorUpdate{abci.ValidatorUpdate{}})
mockAppModule2.EXPECT().EndBlock(gomock.Any(), gomock.Eq(req)).Times(1).Return([]abci.ValidatorUpdate{abci.ValidatorUpdate{}})
mockAppModule1.EXPECT().EndBlock(gomock.Any(), gomock.Eq(req)).Times(1).Return([]abci.ValidatorUpdate{{}})
mockAppModule2.EXPECT().EndBlock(gomock.Any(), gomock.Eq(req)).Times(1).Return([]abci.ValidatorUpdate{{}})
require.Panics(t, func() { mm.EndBlock(sdk.Context{}, req) })
}
types/rest/rest_test.go
+6 -3
View File
@@ -235,8 +235,9 @@ func TestReadRESTReq(t *testing.T) {
// test OK
ReadRESTReq(w, req, codec.New(), &br)
require.Equal(t, BaseReq{ChainID: "alessio", Memo: "text"}, br)
res := w.Result()
t.Cleanup(func() { res.Body.Close() })
require.Equal(t, BaseReq{ChainID: "alessio", Memo: "text"}, br)
require.Equal(t, http.StatusOK, res.StatusCode)
// test non valid JSON
@@ -247,6 +248,7 @@ func TestReadRESTReq(t *testing.T) {
ReadRESTReq(w, req, codec.New(), &br)
require.Equal(t, br, br)
res = w.Result()
t.Cleanup(func() { res.Body.Close() })
require.Equal(t, http.StatusBadRequest, res.StatusCode)
}
@@ -255,6 +257,7 @@ func TestWriteSimulationResponse(t *testing.T) {
w := httptest.NewRecorder()
WriteSimulationResponse(w, codec.New(), 10)
res := w.Result()
t.Cleanup(func() { res.Body.Close() })
require.Equal(t, http.StatusOK, res.StatusCode)
bs, err := ioutil.ReadAll(res.Body)
require.NoError(t, err)
@@ -361,13 +364,13 @@ func TestPostProcessResponseBare(t *testing.T) {
got, err = ioutil.ReadAll(res.Body)
require.NoError(t, err)
t.Cleanup(func() { res.Body.Close() })
require.Equal(t, []string([]string{"application/json"}), res.Header["Content-Type"])
require.Equal(t, []string{"application/json"}, res.Header["Content-Type"])
require.Equal(t, `{"error":"couldn't marshal"}`, string(got))
}
type badJSONMarshaller struct{}
func (_ badJSONMarshaller) MarshalJSON() ([]byte, error) {
func (badJSONMarshaller) MarshalJSON() ([]byte, error) {
return nil, errors.New("couldn't marshal")
}
types/staking_test.go
+4 -4
View File
@@ -12,10 +12,10 @@ func TestBondStatus(t *testing.T) {
require.False(t, sdk.Unbonded.Equal(sdk.Bonded))
require.False(t, sdk.Unbonded.Equal(sdk.Unbonding))
require.False(t, sdk.Bonded.Equal(sdk.Unbonding))
require.Panicsf(t, func() { sdk.BondStatus(0).String() }, "invalid bond status")
require.Equal(t, sdk.BondStatusUnbonded, sdk.BondStatus(sdk.Unbonded).String())
require.Equal(t, sdk.BondStatusBonded, sdk.BondStatus(sdk.Bonded).String())
require.Equal(t, sdk.BondStatusUnbonding, sdk.BondStatus(sdk.Unbonding).String())
require.Panicsf(t, func() { _ = sdk.BondStatus(0).String() }, "invalid bond status")
require.Equal(t, sdk.BondStatusUnbonded, sdk.Unbonded.String())
require.Equal(t, sdk.BondStatusBonded, sdk.Bonded.String())
require.Equal(t, sdk.BondStatusUnbonding, sdk.Unbonding.String())
}
func TestTokensToConsensusPower(t *testing.T) {