Merge branch 'main' into cal/integrate-square-v2

celestiaorg · Aug 7, 2024 · e837547 · e837547
2 parents ff2f864 + 6b01740
commit e837547
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go
@@ -70,8 +70,10 @@ func (b *BenchmarkTest) SetupNodes() error {
 		testnet.WithTimeoutCommit(b.manifest.TimeoutCommit),
 		testnet.WithPrometheus(b.manifest.Prometheus),
 		testnet.WithLocalTracing(b.manifest.LocalTracingType),
+		testnet.WithTxIndexer("kv"),
+		testnet.WithMempoolMaxTxsBytes(1*testnet.GiB),
+		testnet.WithMempoolMaxTxBytes(8*testnet.MiB),
 	))
-
 	if b.manifest.PushTrace {
 		log.Println("reading trace push config")
 		if pushConfig, err := trace.GetPushConfigFromEnv(); err == nil {

diff --git a/test/e2e/testnet/setup.go b/test/e2e/testnet/setup.go
@@ -15,8 +15,8 @@ import (
 func MakeConfig(node *Node, opts ...Option) (*config.Config, error) {
 	cfg := app.DefaultConsensusConfig()
 	cfg.TxIndex.Indexer = "kv"
-	cfg.Mempool.MaxTxsBytes = 1 * GiB
-	cfg.Mempool.MaxTxBytes = 8 * MiB
+	cfg.Consensus.TimeoutPropose = config.DefaultConsensusConfig().TimeoutPropose
+	cfg.Consensus.TimeoutCommit = config.DefaultConsensusConfig().TimeoutCommit
 	cfg.Moniker = node.Name
 	cfg.RPC.ListenAddress = "tcp://0.0.0.0:26657"
 	cfg.P2P.ExternalAddress = fmt.Sprintf("tcp://%v", node.AddressP2P(false))
@@ -77,6 +77,24 @@ func WithLocalTracing(localTracingType string) Option {
 	}
 }
 
+func WithTxIndexer(indexer string) Option {
+	return func(cfg *config.Config) {
+		cfg.TxIndex.Indexer = indexer
+	}
+}
+
+func WithMempoolMaxTxsBytes(maxTxsBytes int64) Option {
+	return func(cfg *config.Config) {
+		cfg.Mempool.MaxTxsBytes = maxTxsBytes
+	}
+}
+
+func WithMempoolMaxTxBytes(maxTxBytes int) Option {
+	return func(cfg *config.Config) {
+		cfg.Mempool.MaxTxBytes = maxTxBytes
+	}
+}
+
 func WriteAddressBook(peers []string, file string) error {
 	book := pex.NewAddrBook(file, false)
 	for _, peer := range peers {