merge nit

skip-mev · Dec 6, 2023 · 6aa6227 · 6aa6227
1 parent a707921
commit 6aa6227
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 404 deletions.
diff --git a/abci/abci_test.go b/abci/abci_test.go
@@ -3,7 +3,6 @@ package abci_test
 import (
 	"context"
 	"math/rand"
-	"os"
 	"testing"
 
 	"cosmossdk.io/math"
@@ -531,7 +530,7 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
 		s.Require().NoError(err)
 
 		proposalHandler := abci.NewProposalHandler(
-			log.NewTMLogger(os.Stdout),
+			log.NewNopLogger(),
 			s.encodingConfig.TxConfig.TxDecoder(),
 			s.encodingConfig.TxConfig.TxEncoder(),
 			mempool,
@@ -577,7 +576,7 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
 		s.Require().NoError(err)
 
 		proposalHandler := abci.NewProposalHandler(
-			log.NewTMLogger(os.Stdout),
+			log.NewNopLogger(),
 			s.encodingConfig.TxConfig.TxDecoder(),
 			s.encodingConfig.TxConfig.TxEncoder(),
 			mempool,
@@ -625,7 +624,7 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
 		s.Require().NoError(err)
 
 		proposalHandler := abci.NewProposalHandler(
-			log.NewTMLogger(os.Stdout),
+			log.NewNopLogger(),
 			s.encodingConfig.TxConfig.TxDecoder(),
 			s.encodingConfig.TxConfig.TxEncoder(),
 			mempool,
@@ -673,7 +672,7 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
 		s.Require().NoError(err)
 
 		proposalHandler := abci.NewProposalHandler(
-			log.NewTMLogger(os.Stdout),
+			log.NewNopLogger(),
 			s.encodingConfig.TxConfig.TxDecoder(),
 			s.encodingConfig.TxConfig.TxEncoder(),
 			mempool,

diff --git a/block/base/lane.go b/block/base/lane.go
@@ -144,14 +144,6 @@ func (l *BaseLane) TxEncoder() sdk.TxEncoder {
 func (l *BaseLane) GetMaxBlockSpace() math.LegacyDec {
 	return l.cfg.MaxBlockSpace
 }
-<<<<<<< HEAD
-=======
-
-// SetMaxBlockSpace sets the maximum amount of block space that the lane is
-// allowed to consume as a percentage of the total block space.
-func (l *BaseLane) SetMaxBlockSpace(maxBlockSpace math.LegacyDec) {
-	l.cfg.MaxBlockSpace = maxBlockSpace
-}
 
 // WithOptions returns a new lane with the given options.
 func (l *BaseLane) WithOptions(options ...LaneOption) *BaseLane {
@@ -161,4 +153,3 @@ func (l *BaseLane) WithOptions(options ...LaneOption) *BaseLane {
 
 	return l
 }
->>>>>>> db58154 (feat: Lane Options (#272))