p2p: minor cleanup + update router options (#6353)

test/e2e/networks/ci.toml

@@ -1,10 +1,10 @@
 # This testnet is run by CI, and attempts to cover a broad range of
 # functionality with a single network.
 
-initial_height = 1000
+disable_legacy_p2p = false
 evidence = 0
-initial_state = { initial01 = "a", initial02 = "b", initial03 = "c" }
-use_new_p2p = false
+initial_height = 1000
+initial_state = {initial01 = "a", initial02 = "b", initial03 = "c"}
 queue_type = "priority"
 
 [validators]
@@ -29,71 +29,71 @@ validator05 = 50
 
 [node.seed01]
 mode = "seed"
-seeds = ["seed02"]
 perturb = ["restart"]
+seeds = ["seed02"]
 
 [node.seed02]
 mode = "seed"
 seeds = ["seed01"]
 
 [node.validator01]
+perturb = ["disconnect"]
 seeds = ["seed01"]
 snapshot_interval = 5
-perturb = ["disconnect"]
 
 [node.validator02]
-seeds = ["seed02"]
-database = "boltdb"
 abci_protocol = "tcp"
-privval_protocol = "tcp"
+database = "boltdb"
 persist_interval = 0
 perturb = ["restart"]
+privval_protocol = "tcp"
+seeds = ["seed02"]
 
 [node.validator03]
-seeds = ["seed01"]
 database = "badgerdb"
+seeds = ["seed01"]
 # FIXME: should be grpc, disabled due to https://github.com/tendermint/tendermint/issues/5439
 #abci_protocol = "grpc"
-privval_protocol = "grpc"
 persist_interval = 3
-retain_blocks = 3
 perturb = ["kill"]
+privval_protocol = "grpc"
+retain_blocks = 3
 
 [node.validator04]
-persistent_peers = ["validator01"]
-database = "rocksdb"
 abci_protocol = "builtin"
+database = "rocksdb"
+persistent_peers = ["validator01"]
 perturb = ["pause"]
 
 [node.validator05]
+database = "cleveldb" 
+fast_sync = "v0" 
+seeds = ["seed02"] 
 start_at = 1005 # Becomes part of the validator set at 1010
-seeds = ["seed02"]
-database = "cleveldb"
-fast_sync = "v0"
 # FIXME: should be grpc, disabled due to https://github.com/tendermint/tendermint/issues/5439
 #abci_protocol = "grpc"
-privval_protocol = "tcp"
 perturb = ["kill", "pause", "disconnect", "restart"]
+privval_protocol = "tcp"
 
 [node.full01]
-start_at = 1010
 mode = "full"
+start_at = 1010
 # FIXME: should be v2, disabled due to flake
 fast_sync = "v0"
 persistent_peers = ["validator01", "validator02", "validator03", "validator04", "validator05"]
-retain_blocks = 3
 perturb = ["restart"]
+retain_blocks = 3
 
 [node.full02]
-start_at = 1015
 mode = "full"
+start_at = 1015
 # FIXME: should be v2, disabled due to flake
 fast_sync = "v0"
-state_sync = true
-seeds = ["seed01"]
 perturb = ["restart"]
+seeds = ["seed01"]
+state_sync = true
 
 [node.light01]
-mode= "light"
-start_at= 1010
-persistent_peers = ["validator01", "validator02", "validator03"]
+mode = "light"
+persistent_peers = ["validator01", "validator02", "validator03"]
+start_at = 1010