From 170cb70e19f6de262598279b9fccaa968ec6d3dc Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 23 Nov 2020 17:32:22 +0400 Subject: [PATCH] test/e2e: enable v1 and v2 blockchains (#5702) * test/e2e: enable v1 and v2 blockchains * modify networks/ci.toml --- test/e2e/generator/generate.go | 12 ++++-------- test/e2e/networks/ci.toml | 9 ++------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/test/e2e/generator/generate.go b/test/e2e/generator/generate.go index 7a1baa254..b67500168 100644 --- a/test/e2e/generator/generate.go +++ b/test/e2e/generator/generate.go @@ -27,14 +27,10 @@ var ( } // The following specify randomly chosen values for testnet nodes. - nodeDatabases = uniformChoice{"goleveldb", "cleveldb", "rocksdb", "boltdb", "badgerdb"} - nodeABCIProtocols = uniformChoice{"unix", "tcp", "grpc", "builtin"} - nodePrivvalProtocols = uniformChoice{"file", "unix", "tcp"} - // FIXME v1 disabled due to https://github.com/tendermint/tendermint/issues/5444 - // FIXME v2 disabled due to: - // https://github.com/tendermint/tendermint/issues/5513 - // https://github.com/tendermint/tendermint/issues/5541 - nodeFastSyncs = uniformChoice{"", "v0"} // "v1", "v2" + nodeDatabases = uniformChoice{"goleveldb", "cleveldb", "rocksdb", "boltdb", "badgerdb"} + nodeABCIProtocols = uniformChoice{"unix", "tcp", "grpc", "builtin"} + nodePrivvalProtocols = uniformChoice{"file", "unix", "tcp"} + nodeFastSyncs = uniformChoice{"", "v0", "v1", "v2"} nodeStateSyncs = uniformChoice{false, true} nodePersistIntervals = uniformChoice{0, 1, 5} nodeSnapshotIntervals = uniformChoice{0, 3} diff --git a/test/e2e/networks/ci.toml b/test/e2e/networks/ci.toml index 67e06bea1..91ed89d63 100644 --- a/test/e2e/networks/ci.toml +++ b/test/e2e/networks/ci.toml @@ -73,9 +73,7 @@ perturb = ["kill", "pause", "disconnect", "restart"] [node.full01] start_at = 1010 mode = "full" -# FIXME Should use v1, but it won't catch up since some nodes don't have all blocks -# https://github.com/tendermint/tendermint/issues/5444 -fast_sync = "v0" +fast_sync = "v1" persistent_peers = ["validator01", "validator02", "validator03", "validator04", "validator05"] retain_blocks = 1 perturb = ["restart"] @@ -83,10 +81,7 @@ perturb = ["restart"] [node.full02] start_at = 1015 mode = "full" -# FIXME Should use v2, but it has concurrency bugs causing panics or halts -# https://github.com/tendermint/tendermint/issues/5513 -# https://github.com/tendermint/tendermint/issues/5541 -fast_sync = "v0" +fast_sync = "v2" state_sync = true seeds = ["seed01"] perturb = ["restart"]