From 69c7a4b818c5c354467a1016ad9fab0096704287 Mon Sep 17 00:00:00 2001 From: dusan-ethernal Date: Mon, 5 Sep 2022 09:28:28 +0200 Subject: [PATCH] Rebase and fix build errors --- Makefile | 4 ++-- app/consumer-democracy/app.go | 3 +-- x/ccv/democracy/democracy_test.go | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 10af2be7e3..5cb0c89796 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ install: go.sum export GOFLAGS='-buildmode=pie' export CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2" export CGO_LDFLAGS="-Wl,-z,relro,-z,now -fstack-protector" - # go install $(BUILD_FLAGS) ./cmd/interchain-security-pd - # go install $(BUILD_FLAGS) ./cmd/interchain-security-cd + go install $(BUILD_FLAGS) ./cmd/interchain-security-pd + go install $(BUILD_FLAGS) ./cmd/interchain-security-cd go install $(BUILD_FLAGS) ./cmd/interchain-security-cdd # run all tests: unit, e2e, diff, and integration diff --git a/app/consumer-democracy/app.go b/app/consumer-democracy/app.go index 593534a6ab..6aacfffa02 100644 --- a/app/consumer-democracy/app.go +++ b/app/consumer-democracy/app.go @@ -259,7 +259,7 @@ func New( capabilitytypes.StoreKey, authzkeeper.StoreKey, ibcconsumertypes.StoreKey, ) - tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey, ccvstakingtypes.TStoreKey) + tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) app := &App{ @@ -334,7 +334,6 @@ func New( ccvstakingKeeper := ccvstakingkeeper.NewKeeper( appCodec, keys[ccvstakingtypes.StoreKey], - tkeys[ccvstakingtypes.TStoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(ccvstakingtypes.ModuleName), diff --git a/x/ccv/democracy/democracy_test.go b/x/ccv/democracy/democracy_test.go index 4085765286..b59cd86d8e 100644 --- a/x/ccv/democracy/democracy_test.go +++ b/x/ccv/democracy/democracy_test.go @@ -18,7 +18,6 @@ import ( appProvider "github.com/cosmos/interchain-security/app/provider" "github.com/cosmos/interchain-security/testutil/simapp" consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types" - providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types" "github.com/cosmos/interchain-security/x/ccv/types" "github.com/cosmos/interchain-security/x/ccv/utils" @@ -91,7 +90,7 @@ func (s *ConsumerDemocracyTestSuite) SetupTest() { s.Require().True(found, "consumer client not found") s.path.EndpointB.ClientID = consumerClient // - set consumer endpoint's clientID - providerClient, found := s.consumerChain.App.(*appConsumer.App).ConsumerKeeper.GetProviderClient(s.consumerChain.GetContext()) + providerClient, found := s.consumerChain.App.(*appConsumer.App).ConsumerKeeper.GetProviderClientID(s.consumerChain.GetContext()) s.Require().True(found, "provider client not found") s.path.EndpointA.ClientID = providerClient // - client config @@ -102,8 +101,8 @@ func (s *ConsumerDemocracyTestSuite) SetupTest() { s.path.EndpointA.ClientConfig.(*ibctesting.TendermintConfig).UnbondingPeriod = consumerUnbondingPeriod s.path.EndpointA.ClientConfig.(*ibctesting.TendermintConfig).TrustingPeriod = consumerUnbondingPeriod / utils.TrustingPeriodFraction // - channel config - s.path.EndpointA.ChannelConfig.PortID = consumertypes.PortID - s.path.EndpointB.ChannelConfig.PortID = providertypes.PortID + s.path.EndpointA.ChannelConfig.PortID = types.ConsumerPortID + s.path.EndpointB.ChannelConfig.PortID = types.ProviderPortID s.path.EndpointA.ChannelConfig.Version = types.Version s.path.EndpointB.ChannelConfig.Version = types.Version s.path.EndpointA.ChannelConfig.Order = channeltypes.ORDERED