chore: expose validator key funcs, increase gas (#868)

* chore: expose validator key funcs, increase gas * chore: update * chore: small fix
strangelove-ventures · Nov 9, 2023 · ba30bbf · ba30bbf
1 parent 6c5ef21
commit ba30bbf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -11,7 +11,7 @@ concurrency:
 jobs:
   test-conformance:
     name: test-conformance
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
     steps:
       # Install and setup go
       - name: Set up Go 1.19
@@ -32,7 +32,7 @@ jobs:
         run: (go test -race -timeout 30m -failfast -v -p 2 ./cmd/interchaintest) || (echo "\n\n*****CHAIN and RELAYER LOGS*****" && cat "$HOME/.interchaintest/logs/interchaintest.log" && exit 1)
   test-ibc-examples:
     name: test-ibc-examples
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
     steps:
       # Install and setup go
       - name: Set up Go 1.19
@@ -54,7 +54,7 @@ jobs:
         run: go test -race -timeout 30m -failfast -v -p 2 ./examples/ibc
   test-cosmos-examples:
     name: test-cosmos-examples
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
     steps:
       # Install and setup go
       - name: Set up Go 1.19

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -11,7 +11,7 @@ concurrency:
 jobs:
   test-unit:
     name: unit-tests
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
     steps:
       # Install and setup go
       - name: Set up Go 1.19

diff --git a/chain/cosmos/chain_node.go b/chain/cosmos/chain_node.go
@@ -195,7 +195,7 @@ func (tn *ChainNode) copyGentx(ctx context.Context, destVal *ChainNode) error {
 	return nil
 }
 
-func (tn *ChainNode) privValFileContent(ctx context.Context) ([]byte, error) {
+func (tn *ChainNode) PrivValFileContent(ctx context.Context) ([]byte, error) {
 	fr := dockerutil.NewFileRetriever(tn.logger(), tn.DockerClient, tn.TestName)
 	gen, err := fr.SingleFileContent(ctx, tn.VolumeName, "config/priv_validator_key.json")
 	if err != nil {
@@ -205,7 +205,7 @@ func (tn *ChainNode) privValFileContent(ctx context.Context) ([]byte, error) {
 	return gen, nil
 }
 
-func (tn *ChainNode) overwritePrivValFile(ctx context.Context, content []byte) error {
+func (tn *ChainNode) OverwritePrivValFile(ctx context.Context, content []byte) error {
 	fw := dockerutil.NewFileWriter(tn.logger(), tn.DockerClient, tn.TestName)
 	if err := fw.WriteFile(ctx, tn.VolumeName, "config/priv_validator_key.json", content); err != nil {
 		return fmt.Errorf("overwriting priv_validator_key.json: %w", err)
@@ -893,7 +893,7 @@ func (tn *ChainNode) QueryClientContractCode(ctx context.Context, codeHash strin
 func (tn *ChainNode) VoteOnProposal(ctx context.Context, keyName string, proposalID string, vote string) error {
 	_, err := tn.ExecTx(ctx, keyName,
 		"gov", "vote",
-		proposalID, vote, "--gas", "auto",
+		proposalID, vote, "--gas", "250000",
 	)
 	return err
 }

diff --git a/chain/cosmos/cosmos_chain.go b/chain/cosmos/cosmos_chain.go
@@ -1003,11 +1003,11 @@ func (c *CosmosChain) StartConsumer(testName string, ctx context.Context, additi
 
 	// Copy provider priv val keys to these nodes
 	for i, val := range c.Provider.Validators {
-		privVal, err := val.privValFileContent(ctx)
+		privVal, err := val.PrivValFileContent(ctx)
 		if err != nil {
 			return err
 		}
-		if err := c.Validators[i].overwritePrivValFile(ctx, privVal); err != nil {
+		if err := c.Validators[i].OverwritePrivValFile(ctx, privVal); err != nil {
 			return err
 		}
 	}