diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go index bd6af3f604..bcf36ed78e 100644 --- a/tests/e2e/actions.go +++ b/tests/e2e/actions.go @@ -433,7 +433,7 @@ func (tr Chain) UpdateConsumer(providerChain ChainID, validator ValidatorID, upd if txResponse.Code != 0 { log.Fatalf("sending update-consumer transaction failed with error code %d, Log:'%s'", txResponse.Code, txResponse.RawLog) } - tr.waitBlocks(ChainID("provi"), 2, 10*time.Second) + tr.waitBlocks(providerChain, 2, 10*time.Second) } // CreateConsumer creates a consumer chain and returns its consumer-id @@ -503,6 +503,7 @@ func (tr Chain) CreateConsumer(providerChain, consumerChain ChainID, validator V log.Fatalf("not able to query tx containing creation-consumer: tx: %s, err: %s, out: %s", txResponse.TxHash, err.Error(), string(bz)) } + fmt.Println("@@@@ created consumer chain tx=", txResponse.TxHash) err = json.Unmarshal(bz, txResponse) if err != nil { @@ -592,6 +593,7 @@ func (tr Chain) submitConsumerAdditionProposal( // - set PowerShaping params TopN > 0 for consumer chain update.PowerShapingParameters.Top_N = action.TopN update.Signer = authority + update.NewOwnerAddress = "" update.InitializationParameters = &InitializationParameters update.InitializationParameters.SpawnTime = spawnTime update.Metadata = &Metadata diff --git a/tests/e2e/config.go b/tests/e2e/config.go index ef5ed75d42..c3f8f712b1 100644 --- a/tests/e2e/config.go +++ b/tests/e2e/config.go @@ -123,7 +123,6 @@ type TestConfig struct { timeOffset time.Duration transformGenesis bool name string - Consumer2ChainID map[ConsumerID]ChainID // dynamic mapping of } // Initialize initializes the TestConfig instance by setting the runningChains field to an empty map. diff --git a/tests/e2e/state.go b/tests/e2e/state.go index efc3d83569..676d8dcfc5 100644 --- a/tests/e2e/state.go +++ b/tests/e2e/state.go @@ -25,7 +25,6 @@ type ( Rewards = e2e.Rewards TextProposal = e2e.TextProposal UpgradeProposal = e2e.UpgradeProposal - ConsumerUpdateProposal = e2e.ConsumerUpdateProposal ConsumerAdditionProposal = e2e.ConsumerAdditionProposal ConsumerRemovalProposal = e2e.ConsumerRemovalProposal ConsumerModificationProposal = e2e.ConsumerModificationProposal @@ -477,7 +476,7 @@ func (tr Commands) GetProposal(chain ChainID, proposal uint) Proposal { } } - updateProposal := e2e.ConsumerUpdateProposal{ + updateProposal := ConsumerAdditionProposal{ Deposit: uint(deposit), Chain: consumerChainId, Status: status, diff --git a/tests/e2e/steps_partial_set_security.go b/tests/e2e/steps_partial_set_security.go index 9638e675f5..156457769b 100644 --- a/tests/e2e/steps_partial_set_security.go +++ b/tests/e2e/steps_partial_set_security.go @@ -2170,7 +2170,7 @@ func stepsModifyChain() []Step { State: State{ ChainID("provi"): ChainState{ Proposals: &map[uint]Proposal{ - 1: ConsumerUpdateProposal{ + 1: ConsumerAdditionProposal{ Deposit: 10000001, Chain: ChainID("consu"), Status: strconv.Itoa(int(gov.ProposalStatus_PROPOSAL_STATUS_VOTING_PERIOD)), @@ -2189,7 +2189,7 @@ func stepsModifyChain() []Step { State: State{ ChainID("provi"): ChainState{ Proposals: &map[uint]Proposal{ - 1: ConsumerUpdateProposal{ + 1: ConsumerAdditionProposal{ Deposit: 10000001, Chain: ChainID("consu"), Status: strconv.Itoa(int(gov.ProposalStatus_PROPOSAL_STATUS_PASSED)), diff --git a/tests/e2e/testlib/types.go b/tests/e2e/testlib/types.go index 739a38f582..8694e7185d 100644 --- a/tests/e2e/testlib/types.go +++ b/tests/e2e/testlib/types.go @@ -292,14 +292,6 @@ type ConsumerAdditionProposal struct { Status string } -type ConsumerUpdateProposal struct { - Deposit uint - Chain ChainID - SpawnTime int - InitialHeight clienttypes.Height - Status string -} - type UpgradeProposal struct { Title string Description string @@ -313,8 +305,6 @@ func (p UpgradeProposal) isProposal() {} func (p ConsumerAdditionProposal) isProposal() {} -func (p ConsumerUpdateProposal) isProposal() {} - type ConsumerRemovalProposal struct { Deposit uint Chain ChainID