From b2d4b9ffef21c4d16e3c6af3602cc92eba506e46 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 12 Jul 2022 13:18:36 -0400
Subject: [PATCH] p2p: switch default queue implementation (backport #8976)
 (#8981)

---
 config/config.go               | 2 +-
 test/e2e/generator/generate.go | 2 +-
 test/e2e/networks/ci.toml      | 2 +-
 test/e2e/pkg/testnet.go        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/config.go b/config/config.go
index 176ab4767..48cb27a45 100644
--- a/config/config.go
+++ b/config/config.go
@@ -694,7 +694,7 @@ func DefaultP2PConfig() *P2PConfig {
 		HandshakeTimeout:        20 * time.Second,
 		DialTimeout:             3 * time.Second,
 		TestDialFail:            false,
-		QueueType:               "priority",
+		QueueType:               "simple-priority",
 	}
 }
 
diff --git a/test/e2e/generator/generate.go b/test/e2e/generator/generate.go
index 01e04a418..d5d628aee 100644
--- a/test/e2e/generator/generate.go
+++ b/test/e2e/generator/generate.go
@@ -115,7 +115,7 @@ func generateTestnet(r *rand.Rand, opt map[string]interface{}) (e2e.Manifest, er
 		Nodes:            map[string]*e2e.ManifestNode{},
 		KeyType:          keyType.Choose(r).(string),
 		Evidence:         evidence.Choose(r).(int),
-		QueueType:        "priority",
+		QueueType:        "simple-priority",
 		TxSize:           opt["txSize"].(int),
 	}
 
diff --git a/test/e2e/networks/ci.toml b/test/e2e/networks/ci.toml
index eb74dd111..f72bddfd4 100644
--- a/test/e2e/networks/ci.toml
+++ b/test/e2e/networks/ci.toml
@@ -4,7 +4,7 @@
 evidence = 5
 initial_height = 1000
 initial_state = {initial01 = "a", initial02 = "b", initial03 = "c"}
-queue_type = "priority"
+queue_type = "simple-priority"
 abci_protocol = "builtin"
 
 [validators]
diff --git a/test/e2e/pkg/testnet.go b/test/e2e/pkg/testnet.go
index a5c8dffd6..9c337b321 100644
--- a/test/e2e/pkg/testnet.go
+++ b/test/e2e/pkg/testnet.go
@@ -356,7 +356,7 @@ func (n Node) Validate(testnet Testnet) error {
 		return fmt.Errorf("invalid mempool version %q", n.Mempool)
 	}
 	switch n.QueueType {
-	case "", "priority", "fifo":
+	case "", "priority", "fifo", "simple-priority":
 	default:
 		return fmt.Errorf("unsupported p2p queue type: %s", n.QueueType)
 	}