Rebase and fix build errors

cosmos · Sep 9, 2022 · 69c7a4b · 69c7a4b
1 parent f5a2545
commit 69c7a4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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