cover up a few other missing cases

celestiaorg · Aug 27, 2024 · e5d7fc3 · e5d7fc3
1 parent 506abdc
commit e5d7fc3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/test/e2e/docker/Dockerfile b/test/e2e/docker/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null
 RUN apt-get -qq install -y libleveldb-dev librocksdb-dev >/dev/null
 
 # Set up build directory /src/cometbft
-ENV COMETBFT_BUILD_OPTIONS badgerdb,boltdb,cleveldb,rocksdb
+ENV COMETBFT_BUILD_OPTIONS=badgerdb,boltdb,cleveldb,rocksdb
 WORKDIR /src/cometbft
 
 # Fetch dependencies separately (for layer caching)

diff --git a/test/e2e/networks/ci.toml b/test/e2e/networks/ci.toml
@@ -39,7 +39,6 @@ seeds = ["seed01"]
 seeds = ["seed01"]
 snapshot_interval = 5
 perturb = ["disconnect"]
-misbehaviors = { 1018 = "double-prevote" }
 
 [node.validator02]
 seeds = ["seed02"]

diff --git a/test/e2e/pkg/infra/docker/docker.go b/test/e2e/pkg/infra/docker/docker.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"os"
 	"path/filepath"
-	"strconv"
 	"text/template"
 
 	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
@@ -38,20 +37,7 @@ func (p *Provider) Setup() error {
 // file as bytes to be written out to disk.
 func dockerComposeBytes(testnet *e2e.Testnet) ([]byte, error) {
 	// Must use version 2 Docker Compose format, to support IPv6.
-	tmpl, err := template.New("docker-compose").Funcs(template.FuncMap{
-		"misbehaviorsToString": func(misbehaviors map[int64]string) string {
-			str := ""
-			for height, misbehavior := range misbehaviors {
-				// after the first behavior set, a comma must be prepended
-				if str != "" {
-					str += ","
-				}
-				heightString := strconv.Itoa(int(height))
-				str += misbehavior + "," + heightString
-			}
-			return str
-		},
-	}).Parse(`version: '2.4'
+	tmpl, err := template.New("docker-compose").Parse(`version: '2.4'
 
 networks:
   {{ .Name }}: