diff --git a/test/e2e/node/config.go b/test/e2e/node/config.go index 6941d0a1c..954d382e4 100644 --- a/test/e2e/node/config.go +++ b/test/e2e/node/config.go @@ -23,7 +23,6 @@ type Config struct { PrivValServer string `toml:"privval_server"` PrivValKey string `toml:"privval_key"` PrivValState string `toml:"privval_state"` - Misbehaviors map[string]string `toml:"misbehaviors"` KeyType string `toml:"key_type"` } diff --git a/test/e2e/pkg/infra/docker/docker.go b/test/e2e/pkg/infra/docker/docker.go index 4d52a3d37..116497dca 100644 --- 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,21 +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 }}: labels: