Skip to content

Commit b8db7bc

Browse files
p-offtermattp-offtermatt
committed
Revert changes to e2e tests
1 parent 703e462 commit b8db7bc

File tree

3 files changed

+51
-57
lines changed

3 files changed

+51
-57
lines changed

‎tests/e2e/actions.go

Lines changed: 14 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ func (tr TestConfig) sendTokens(
4141
tr.validatorConfigs[action.From].DelAddress,
4242
tr.validatorConfigs[action.To].DelAddress,
4343
fmt.Sprint(action.Amount)+`stake`,
44-
`--gas-prices`, `0.0025stake`,
45-
`--gas-adjustment`, `1.5`,
44+
4645
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
4746
`--home`, tr.getValidatorHome(action.Chain, action.From),
4847
`--node`, tr.getValidatorNode(action.Chain, action.From),
@@ -205,9 +204,6 @@ func (tr TestConfig) submitTextProposal(
205204
`--description`, action.Description,
206205
`--deposit`, fmt.Sprint(action.Deposit)+`stake`,
207206
`--from`, `validator`+fmt.Sprint(action.From),
208-
`--gas`, "auto",
209-
`--gas-prices`, `0.0025stake`,
210-
`--gas-adjustment`, `1.5`,
211207
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
212208
`--home`, tr.getValidatorHome(action.Chain, action.From),
213209
`--node`, tr.getValidatorNode(action.Chain, action.From),
@@ -277,22 +273,16 @@ func (tr TestConfig) submitConsumerAdditionProposal(
277273

278274
//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.
279275
// CONSUMER ADDITION PROPOSAL
280-
cmd := exec.Command("docker", "exec", tr.containerConfig.InstanceName, tr.chainConfigs[action.Chain].BinaryName,
276+
bz, err = exec.Command("docker", "exec", tr.containerConfig.InstanceName, tr.chainConfigs[action.Chain].BinaryName,
281277
"tx", "gov", "submit-legacy-proposal", "consumer-addition", "/temp-proposal.json",
282278
`--from`, `validator`+fmt.Sprint(action.From),
283-
`--gas-prices`, `0.0025stake`,
284-
`--gas-adjustment`, `1.5`,
285279
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
286280
`--home`, tr.getValidatorHome(action.Chain, action.From),
287-
`--gas`, "auto",
281+
`--gas`, `900000`,
288282
`--node`, tr.getValidatorNode(action.Chain, action.From),
289283
`--keyring-backend`, `test`,
290284
`-y`,
291-
)
292-
293-
log.Println(cmd)
294-
295-
bz, err = cmd.CombinedOutput()
285+
).CombinedOutput()
296286

297287
if err != nil {
298288
log.Fatal(err, "\n", string(bz))
@@ -347,12 +337,10 @@ func (tr TestConfig) submitConsumerRemovalProposal(
347337
"tx", "gov", "submit-legacy-proposal", "consumer-removal",
348338
"/temp-proposal.json",
349339
`--from`, `validator`+fmt.Sprint(action.From),
350-
`--gas-prices`, `0.0025stake`,
351-
`--gas-adjustment`, `1.5`,
352340
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
353341
`--home`, tr.getValidatorHome(action.Chain, action.From),
354342
`--node`, tr.getValidatorNode(action.Chain, action.From),
355-
`--gas`, "auto",
343+
`--gas`, "900000",
356344
`--keyring-backend`, `test`,
357345
`-y`,
358346
).CombinedOutput()
@@ -425,12 +413,10 @@ func (tr TestConfig) submitParamChangeProposal(
425413
"tx", "gov", "submit-legacy-proposal", "param-change", "/params-proposal.json",
426414

427415
`--from`, `validator`+fmt.Sprint(action.From),
428-
`--gas-prices`, `0.0025stake`,
429-
`--gas-adjustment`, `1.5`,
430416
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
431417
`--home`, tr.getValidatorHome(action.Chain, action.From),
432418
`--node`, tr.getValidatorNode(action.Chain, action.From),
433-
`--gas`, "auto",
419+
`--gas`, "900000",
434420
`--keyring-backend`, `test`,
435421
`-y`,
436422
)
@@ -468,13 +454,11 @@ func (tr *TestConfig) voteGovProposal(
468454
fmt.Sprint(action.PropNumber), vote,
469455

470456
`--from`, `validator`+fmt.Sprint(val),
471-
`--gas-prices`, `0.0025stake`,
472-
`--gas-adjustment`, `1.5`,
473457
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
474458
`--home`, tr.getValidatorHome(action.Chain, val),
475459
`--node`, tr.getValidatorNode(action.Chain, val),
476460
`--keyring-backend`, `test`,
477-
`--gas`, "auto",
461+
`--gas`, "900000",
478462
`-y`,
479463
).CombinedOutput()
480464
if err != nil {
@@ -685,7 +669,7 @@ ccv_consumer_chain = %v
685669
686670
[chains.gas_price]
687671
denom = "stake"
688-
price = 0.025
672+
price = 0.000
689673
690674
[chains.trust_threshold]
691675
denominator = "3"
@@ -968,10 +952,6 @@ func (tr TestConfig) addIbcConnectionHermes(
968952
"--b-client", "07-tendermint-"+fmt.Sprint(action.ClientB),
969953
)
970954

971-
if verbose {
972-
log.Println("addIbcConnectionHermes cmd: ", cmd.String())
973-
}
974-
975955
cmdReader, err := cmd.StdoutPipe()
976956
if err != nil {
977957
log.Fatal(err)
@@ -1343,9 +1323,6 @@ func (tr TestConfig) delegateTokens(
13431323
fmt.Sprint(action.Amount)+`stake`,
13441324

13451325
`--from`, `validator`+fmt.Sprint(action.From),
1346-
`--gas`, "auto",
1347-
`--gas-prices`, `0.0025stake`,
1348-
`--gas-adjustment`, `1.5`,
13491326
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
13501327
`--home`, tr.getValidatorHome(action.Chain, action.From),
13511328
`--node`, tr.getValidatorNode(action.Chain, action.From),
@@ -1390,12 +1367,10 @@ func (tr TestConfig) unbondTokens(
13901367
fmt.Sprint(action.Amount)+`stake`,
13911368

13921369
`--from`, `validator`+fmt.Sprint(action.Sender),
1393-
`--gas-prices`, `0.0025stake`,
1394-
`--gas-adjustment`, `1.5`,
13951370
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
13961371
`--home`, tr.getValidatorHome(action.Chain, action.Sender),
13971372
`--node`, tr.getValidatorNode(action.Chain, action.Sender),
1398-
`--gas`, "auto",
1373+
`--gas`, "900000",
13991374
`--keyring-backend`, `test`,
14001375
`-y`,
14011376
)
@@ -1459,12 +1434,10 @@ func (tr TestConfig) cancelUnbondTokens(
14591434
fmt.Sprint(action.Amount)+`stake`,
14601435
fmt.Sprint(creationHeight),
14611436
`--from`, `validator`+fmt.Sprint(action.Delegator),
1462-
`--gas-prices`, `0.0025stake`,
1463-
`--gas-adjustment`, `1.5`,
14641437
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
14651438
`--home`, tr.getValidatorHome(action.Chain, action.Delegator),
14661439
`--node`, tr.getValidatorNode(action.Chain, action.Delegator),
1467-
`--gas`, "auto",
1440+
`--gas`, "900000",
14681441
`--keyring-backend`, `test`,
14691442
`-o`, `json`,
14701443
`-y`,
@@ -1514,13 +1487,11 @@ func (tr TestConfig) redelegateTokens(action redelegateTokensAction, verbose boo
15141487
redelegateDst,
15151488
fmt.Sprint(action.Amount)+`stake`,
15161489
`--from`, `validator`+fmt.Sprint(action.TxSender),
1517-
`--gas-prices`, `0.0025stake`,
1518-
`--gas-adjustment`, `1.5`,
15191490
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
15201491
`--home`, tr.getValidatorHome(action.Chain, action.TxSender),
15211492
`--node`, tr.getValidatorNode(action.Chain, action.TxSender),
15221493
// Need to manually set gas limit past default (200000), since redelegate has a lot of operations
1523-
`--gas`, "auto",
1494+
`--gas`, "900000",
15241495
`--keyring-backend`, `test`,
15251496
`-y`,
15261497
)
@@ -1646,9 +1617,7 @@ func (tr TestConfig) unjailValidator(action unjailValidatorAction, verbose bool)
16461617
`--chain-id`, string(tr.chainConfigs[action.Provider].ChainId),
16471618
`--home`, tr.getValidatorHome(action.Provider, action.Validator),
16481619
`--node`, tr.getValidatorNode(action.Provider, action.Validator),
1649-
`--gas`, "auto",
1650-
`--gas-prices`, `0.0025stake`,
1651-
`--gas-adjustment`, `1.5`,
1620+
`--gas`, "900000",
16521621
`--keyring-backend`, `test`,
16531622
`-y`,
16541623
)
@@ -1706,9 +1675,6 @@ func (tr TestConfig) registerRepresentative(
17061675
`--commission-max-change-rate`, "0.01",
17071676
`--min-self-delegation`, "1",
17081677
`--from`, `validator`+fmt.Sprint(val),
1709-
`--gas`, "auto",
1710-
`--gas-prices`, `0.0025stake`,
1711-
`--gas-adjustment`, `1.5`,
17121678
`--chain-id`, string(tr.chainConfigs[action.Chain].ChainId),
17131679
`--home`, tr.getValidatorHome(action.Chain, val),
17141680
`--node`, tr.getValidatorNode(action.Chain, val),
@@ -1773,9 +1739,7 @@ func (tr TestConfig) submitChangeRewardDenomsProposal(action submitChangeRewardD
17731739
`--chain-id`, string(providerChain.ChainId),
17741740
`--home`, tr.getValidatorHome(providerChain.ChainId, action.From),
17751741
`--node`, tr.getValidatorNode(providerChain.ChainId, action.From),
1776-
`--gas`, "auto",
1777-
`--gas-prices`, `0.0025stake`,
1778-
`--gas-adjustment`, `1.5`,
1742+
`--gas`, "9000000",
17791743
`--keyring-backend`, `test`,
17801744
`-y`,
17811745
).CombinedOutput()
@@ -1928,7 +1892,7 @@ func (tr TestConfig) assignConsumerPubKey(action assignConsumerPubKeyAction, ver
19281892
gas = "9000000"
19291893
}
19301894
assignKey := fmt.Sprintf(
1931-
`%s tx provider assign-consensus-key %s '%s' --from validator%s --chain-id %s --home %s --node %s --gas %s --gas-prices %s --gas-adjustment 1.5 --keyring-backend test -y -o json`,
1895+
`%s tx provider assign-consensus-key %s '%s' --from validator%s --chain-id %s --home %s --node %s --gas %s --keyring-backend test -y -o json`,
19321896
tr.chainConfigs[ChainID("provi")].BinaryName,
19331897
string(tr.chainConfigs[action.Chain].ChainId),
19341898
action.ConsumerPubkey,
@@ -1937,7 +1901,6 @@ func (tr TestConfig) assignConsumerPubKey(action assignConsumerPubKeyAction, ver
19371901
tr.getValidatorHome(ChainID("provi"), action.Validator),
19381902
tr.getValidatorNode(ChainID("provi"), action.Validator),
19391903
gas,
1940-
`0.0025stake`,
19411904
)
19421905

19431906
//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.

‎tests/e2e/steps_start_chains.go

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,20 @@ func stepStartProviderChain() []Step {
1010
Action: StartChainAction{
1111
Chain: ChainID("provi"),
1212
Validators: []StartChainValidator{
13-
{Id: ValidatorID("bob"), Stake: 500000000, Allocation: 1000000000000000},
14-
{Id: ValidatorID("alice"), Stake: 500000000, Allocation: 1000000000000000},
15-
{Id: ValidatorID("carol"), Stake: 500000000, Allocation: 1000000000000000},
13+
{Id: ValidatorID("bob"), Stake: 500000000, Allocation: 10000000000},
14+
{Id: ValidatorID("alice"), Stake: 500000000, Allocation: 10000000000},
15+
{Id: ValidatorID("carol"), Stake: 500000000, Allocation: 10000000000},
16+
},
17+
},
18+
State: State{
19+
ChainID("provi"): ChainState{
20+
ValBalances: &map[ValidatorID]uint{
21+
ValidatorID("alice"): 9500000000,
22+
ValidatorID("bob"): 9500000000,
23+
ValidatorID("carol"): 9500000000,
24+
},
1625
},
1726
},
18-
State: State{},
1927
},
2028
}
2129
}
@@ -33,6 +41,10 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint
3341
},
3442
State: State{
3543
ChainID("provi"): ChainState{
44+
ValBalances: &map[ValidatorID]uint{
45+
ValidatorID("alice"): 9489999999,
46+
ValidatorID("bob"): 9500000000,
47+
},
3648
Proposals: &map[uint]Proposal{
3749
proposalIndex: ConsumerAdditionProposal{
3850
Deposit: 10000001,
@@ -122,6 +134,10 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint
122134
Status: "PROPOSAL_STATUS_PASSED",
123135
},
124136
},
137+
ValBalances: &map[ValidatorID]uint{
138+
ValidatorID("alice"): 9500000000,
139+
ValidatorID("bob"): 9500000000,
140+
},
125141
},
126142
},
127143
},
@@ -141,7 +157,23 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint
141157
// values from the genesis file.
142158
GenesisChanges: ".app_state.ccvconsumer.params.soft_opt_out_threshold = \"0.05\"",
143159
},
144-
State: State{},
160+
State: State{
161+
ChainID("provi"): ChainState{
162+
ValBalances: &map[ValidatorID]uint{
163+
ValidatorID("alice"): 9500000000,
164+
ValidatorID("bob"): 9500000000,
165+
ValidatorID("carol"): 9500000000,
166+
},
167+
ProposedConsumerChains: &[]string{},
168+
},
169+
ChainID(consumerName): ChainState{
170+
ValBalances: &map[ValidatorID]uint{
171+
ValidatorID("alice"): 10000000000,
172+
ValidatorID("bob"): 10000000000,
173+
ValidatorID("carol"): 10000000000,
174+
},
175+
},
176+
},
145177
},
146178
{
147179
Action: addIbcConnectionAction{

‎tests/e2e/testnet-scripts/start-chain.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ do
198198
#'s/foo/bar/;s/abc/def/'
199199
sed -i "$TENDERMINT_CONFIG_TRANSFORM" $CHAIN_ID/validator$VAL_ID/config/config.toml
200200
fi
201-
sed -i 's/minimum-gas-prices = "0stake"/minimum-gas-prices = "0.0025stake"/g' $CHAIN_ID/validator$VAL_ID/config/app.toml
202201
done
203202

204203

0 commit comments

Comments
 (0)