diff --git a/types/module/module_test.go b/types/module/module_test.go index db2334696..65df4e8ea 100644 --- a/types/module/module_test.go +++ b/types/module/module_test.go @@ -24,29 +24,19 @@ func TestBasicManager(t *testing.T) { mockCtrl := gomock.NewController(t) t.Cleanup(mockCtrl.Finish) cdc := codec.New() - wantDefaultGenesis := map[string]json.RawMessage{ - "mockAppModuleBasic1": json.RawMessage(``), - "mockAppModuleBasic2": json.RawMessage(`{"key":"value"}`), - } + wantDefaultGenesis := map[string]json.RawMessage{"mockAppModuleBasic1": json.RawMessage(``)} mockAppModuleBasic1 := mocks.NewMockAppModuleBasic(mockCtrl) - mockAppModuleBasic2 := mocks.NewMockAppModuleBasic(mockCtrl) mockAppModuleBasic1.EXPECT().Name().AnyTimes().Return("mockAppModuleBasic1") - mockAppModuleBasic2.EXPECT().Name().AnyTimes().Return("mockAppModuleBasic2") mockAppModuleBasic1.EXPECT().DefaultGenesis(gomock.Eq(cdc)).Times(1).Return(json.RawMessage(``)) - mockAppModuleBasic2.EXPECT().DefaultGenesis(gomock.Eq(cdc)).Times(1).Return(json.RawMessage(`{"key":"value"}`)) mockAppModuleBasic1.EXPECT().ValidateGenesis(gomock.Eq(cdc), gomock.Eq(wantDefaultGenesis["mockAppModuleBasic1"])).Times(1).Return(errFoo) mockAppModuleBasic1.EXPECT().RegisterRESTRoutes(gomock.Eq(context.CLIContext{}), gomock.Eq(&mux.Router{})).Times(1) - mockAppModuleBasic2.EXPECT().RegisterRESTRoutes(gomock.Eq(context.CLIContext{}), gomock.Eq(&mux.Router{})).Times(1) mockAppModuleBasic1.EXPECT().RegisterCodec(gomock.Eq(cdc)).Times(1) - mockAppModuleBasic2.EXPECT().RegisterCodec(gomock.Eq(cdc)).Times(1) mockAppModuleBasic1.EXPECT().GetTxCmd(cdc).Times(1).Return(nil) - mockAppModuleBasic2.EXPECT().GetTxCmd(cdc).Times(1).Return(&cobra.Command{}) mockAppModuleBasic1.EXPECT().GetQueryCmd(cdc).Times(1).Return(nil) - mockAppModuleBasic2.EXPECT().GetQueryCmd(cdc).Times(1).Return(&cobra.Command{}) - mm := module.NewBasicManager(mockAppModuleBasic1, mockAppModuleBasic2) + mm := module.NewBasicManager(mockAppModuleBasic1) require.Equal(t, mm["mockAppModuleBasic1"], mockAppModuleBasic1) mm.RegisterCodec(cdc) @@ -54,8 +44,7 @@ func TestBasicManager(t *testing.T) { require.Equal(t, wantDefaultGenesis, mm.DefaultGenesis(cdc)) var data map[string]string - require.NoError(t, json.Unmarshal(wantDefaultGenesis["mockAppModuleBasic2"], &data)) - require.Equal(t, map[string]string{"key": "value"}, data) + require.Equal(t, map[string]string(nil), data) require.True(t, errors.Is(errFoo, mm.ValidateGenesis(cdc, wantDefaultGenesis))) @@ -71,7 +60,6 @@ func TestBasicManager(t *testing.T) { } func TestGenesisOnlyAppModule(t *testing.T) { - t.Parallel() mockCtrl := gomock.NewController(t) t.Cleanup(mockCtrl.Finish) @@ -91,7 +79,6 @@ func TestGenesisOnlyAppModule(t *testing.T) { } func TestManagerOrderSetters(t *testing.T) { - t.Parallel() mockCtrl := gomock.NewController(t) t.Cleanup(mockCtrl.Finish) mockAppModule1 := mocks.NewMockAppModule(mockCtrl) @@ -121,7 +108,6 @@ func TestManagerOrderSetters(t *testing.T) { } func TestManager_RegisterInvariants(t *testing.T) { - t.Parallel() mockCtrl := gomock.NewController(t) t.Cleanup(mockCtrl.Finish) @@ -141,7 +127,6 @@ func TestManager_RegisterInvariants(t *testing.T) { } func TestManager_RegisterRoutes(t *testing.T) { - t.Parallel() mockCtrl := gomock.NewController(t) t.Cleanup(mockCtrl.Finish) @@ -173,7 +158,6 @@ func TestManager_RegisterRoutes(t *testing.T) { } func TestManager_InitGenesis(t *testing.T) { - t.Parallel() mockCtrl := gomock.NewController(t) t.Cleanup(mockCtrl.Finish)