From 2d3d610513dae34463cba7dc36774e43f3b6627e Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Thu, 30 Jul 2020 07:48:15 +0000 Subject: [PATCH] oasis-test-runner: Don't bother setting `--assume_yes` when not needed Since the sub-commands ran from the test harness will always have stdin tied to `/dev/null`, this is now implicit. --- go/oasis-test-runner/oasis/cli/keymanager.go | 1 - go/oasis-test-runner/oasis/cli/registry.go | 1 - go/oasis-test-runner/scenario/e2e/registry_cli.go | 2 -- go/oasis-test-runner/scenario/e2e/stake_cli.go | 5 ----- 4 files changed, 9 deletions(-) diff --git a/go/oasis-test-runner/oasis/cli/keymanager.go b/go/oasis-test-runner/oasis/cli/keymanager.go index 3fea8aec06c..419b58585a3 100644 --- a/go/oasis-test-runner/oasis/cli/keymanager.go +++ b/go/oasis-test-runner/oasis/cli/keymanager.go @@ -98,7 +98,6 @@ func (k *KeymanagerHelpers) GenUpdate(nonce uint64, polPath string, polSigPaths "--" + cmdConsensus.CfgTxFeeAmount, strconv.Itoa(0), // TODO: Make fee configurable. "--" + cmdConsensus.CfgTxFeeGas, strconv.Itoa(10000), // TODO: Make fee configurable. "--" + cmdKM.CfgPolicyFile, polPath, - "--" + flags.CfgAssumeYes, "--" + flags.CfgDebugDontBlameOasis, "--" + cmdCommon.CfgDebugAllowTestKeys, "--" + flags.CfgDebugTestEntity, diff --git a/go/oasis-test-runner/oasis/cli/registry.go b/go/oasis-test-runner/oasis/cli/registry.go index 4840a1f2926..f347636fc58 100644 --- a/go/oasis-test-runner/oasis/cli/registry.go +++ b/go/oasis-test-runner/oasis/cli/registry.go @@ -129,7 +129,6 @@ func (r *RegistryHelpers) GenerateRegisterRuntimeTx( "--"+consensus.CfgTxFile, txPath, "--"+consensus.CfgTxFeeAmount, strconv.Itoa(0), // TODO: Make fee configurable. "--"+consensus.CfgTxFeeGas, strconv.Itoa(10000), // TODO: Make fee configurable. - "--"+flags.CfgAssumeYes, "--"+flags.CfgDebugDontBlameOasis, "--"+cmdCommon.CfgDebugAllowTestKeys, "--"+flags.CfgDebugTestEntity, diff --git a/go/oasis-test-runner/scenario/e2e/registry_cli.go b/go/oasis-test-runner/scenario/e2e/registry_cli.go index d91d90b613c..ebeb7223129 100644 --- a/go/oasis-test-runner/scenario/e2e/registry_cli.go +++ b/go/oasis-test-runner/scenario/e2e/registry_cli.go @@ -554,7 +554,6 @@ func (sc *registryCLIImpl) genRegisterEntityTx(childEnv *env.Env, nonce int, txP "--" + consensus.CfgTxFile, txPath, "--" + consensus.CfgTxFeeAmount, strconv.Itoa(0), "--" + consensus.CfgTxFeeGas, strconv.Itoa(feeGas), - "--" + flags.CfgAssumeYes, "--" + flags.CfgDebugDontBlameOasis, "--" + cmdCommon.CfgDebugAllowTestKeys, "--" + cmdSigner.CfgSigner, fileSigner.SignerName, @@ -578,7 +577,6 @@ func (sc *registryCLIImpl) genDeregisterEntityTx(childEnv *env.Env, nonce int, t "--" + consensus.CfgTxFile, txPath, "--" + consensus.CfgTxFeeAmount, strconv.Itoa(0), "--" + consensus.CfgTxFeeGas, strconv.Itoa(feeGas), - "--" + flags.CfgAssumeYes, "--" + flags.CfgDebugDontBlameOasis, "--" + cmdCommon.CfgDebugAllowTestKeys, "--" + cmdSigner.CfgSigner, fileSigner.SignerName, diff --git a/go/oasis-test-runner/scenario/e2e/stake_cli.go b/go/oasis-test-runner/scenario/e2e/stake_cli.go index 20b64c15da9..efbf6d5b3b5 100644 --- a/go/oasis-test-runner/scenario/e2e/stake_cli.go +++ b/go/oasis-test-runner/scenario/e2e/stake_cli.go @@ -760,7 +760,6 @@ func (sc *stakeCLIImpl) genTransferTx(childEnv *env.Env, amount int, nonce uint6 "--" + stake.CfgTransferDestination, dst.String(), "--" + consensus.CfgTxFeeAmount, strconv.Itoa(feeAmount), "--" + consensus.CfgTxFeeGas, strconv.Itoa(feeGas), - "--" + flags.CfgAssumeYes, "--" + flags.CfgDebugDontBlameOasis, "--" + flags.CfgDebugTestEntity, "--" + common.CfgDebugAllowTestKeys, @@ -782,7 +781,6 @@ func (sc *stakeCLIImpl) genBurnTx(childEnv *env.Env, amount int, nonce uint64, t "--" + consensus.CfgTxFile, txPath, "--" + consensus.CfgTxFeeAmount, strconv.Itoa(feeAmount), "--" + consensus.CfgTxFeeGas, strconv.Itoa(feeGas), - "--" + flags.CfgAssumeYes, "--" + flags.CfgDebugDontBlameOasis, "--" + flags.CfgDebugTestEntity, "--" + common.CfgDebugAllowTestKeys, @@ -805,7 +803,6 @@ func (sc *stakeCLIImpl) genEscrowTx(childEnv *env.Env, amount int, nonce uint64, "--" + stake.CfgEscrowAccount, escrow.String(), "--" + consensus.CfgTxFeeAmount, strconv.Itoa(feeAmount), "--" + consensus.CfgTxFeeGas, strconv.Itoa(feeGas), - "--" + flags.CfgAssumeYes, "--" + flags.CfgDebugDontBlameOasis, "--" + flags.CfgDebugTestEntity, "--" + common.CfgDebugAllowTestKeys, @@ -828,7 +825,6 @@ func (sc *stakeCLIImpl) genReclaimEscrowTx(childEnv *env.Env, shares int, nonce "--" + stake.CfgEscrowAccount, escrow.String(), "--" + consensus.CfgTxFeeAmount, strconv.Itoa(feeAmount), "--" + consensus.CfgTxFeeGas, strconv.Itoa(feeGas), - "--" + flags.CfgAssumeYes, "--" + flags.CfgDebugDontBlameOasis, "--" + flags.CfgDebugTestEntity, "--" + common.CfgDebugAllowTestKeys, @@ -849,7 +845,6 @@ func (sc *stakeCLIImpl) genAmendCommissionScheduleTx(childEnv *env.Env, nonce in "--" + consensus.CfgTxFile, txPath, "--" + consensus.CfgTxFeeAmount, strconv.Itoa(feeAmount), "--" + consensus.CfgTxFeeGas, strconv.Itoa(feeGas), - "--" + flags.CfgAssumeYes, "--" + flags.CfgDebugDontBlameOasis, "--" + flags.CfgDebugTestEntity, "--" + common.CfgDebugAllowTestKeys,