p2p: switch default queue implementation (#8976)

config/config.go

@@ -685,7 +685,7 @@ func DefaultP2PConfig() *P2PConfig {
 		PexReactor:              true,
 		HandshakeTimeout:        20 * time.Second,
 		DialTimeout:             3 * time.Second,
-		QueueType:               "priority",
+		QueueType:               "simple-priority",
 	}
 }
 

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),
 	}
 

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]

test/e2e/pkg/testnet.go

@@ -355,7 +355,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)
 	}