Clean up full node

Author: Manav-Aggarwal

node/full.go

@@ -64,14 +64,14 @@ type FullNode struct {
 	P2P  *p2p.Client
 
 	// TODO(tzdybal): consider extracting "mempool reactor"
-	Mempool      mempool.Mempool
-	mempoolIDs   *mempoolIDs
-	incomingTxCh chan *p2p.GossipMessage
+	Mempool    mempool.Mempool
+	mempoolIDs *mempoolIDs
 
 	Store        store.Store
 	blockManager *block.Manager
 	dalc         da.DataAvailabilityLayerClient
 
+	// Preserves cometBFT compatibility
 	TxIndexer      txindex.TxIndexer
 	BlockIndexer   indexer.BlockIndexer
 	IndexerService *txindex.IndexerService
@@ -84,9 +84,6 @@ type FullNode struct {
 	ctx context.Context
 
 	cancel context.CancelFunc
-
-	// For use in Lazy Aggregator
-	DoneBuildingBlock chan struct{}
 }
 
 // newFullNode creates a new Rollkit full node.
@@ -170,25 +167,23 @@ func newFullNode(
 	ctx, cancel := context.WithCancel(ctx)
 
 	node := &FullNode{
-		proxyApp:          proxyApp,
-		eventBus:          eventBus,
-		genesis:           genesis,
-		conf:              conf,
-		P2P:               client,
-		blockManager:      blockManager,
-		dalc:              dalc,
-		Mempool:           mp,
-		mempoolIDs:        mpIDs,
-		incomingTxCh:      make(chan *p2p.GossipMessage),
-		Store:             s,
-		TxIndexer:         txIndexer,
-		IndexerService:    indexerService,
-		BlockIndexer:      blockIndexer,
-		hExService:        headerExchangeService,
-		bExService:        blockExchangeService,
-		ctx:               ctx,
-		cancel:            cancel,
-		DoneBuildingBlock: doneBuildingChannel,
+		proxyApp:       proxyApp,
+		eventBus:       eventBus,
+		genesis:        genesis,
+		conf:           conf,
+		P2P:            client,
+		blockManager:   blockManager,
+		dalc:           dalc,
+		Mempool:        mp,
+		mempoolIDs:     mpIDs,
+		Store:          s,
+		TxIndexer:      txIndexer,
+		IndexerService: indexerService,
+		BlockIndexer:   blockIndexer,
+		hExService:     headerExchangeService,
+		bExService:     blockExchangeService,
+		ctx:            ctx,
+		cancel:         cancel,
 	}
 
 	node.BaseService = *service.NewBaseService(logger, "Node", node)

node/full_node_integration_test.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/rollkit/rollkit/config"
 	mockda "github.com/rollkit/rollkit/da/mock"
-	"github.com/rollkit/rollkit/p2p"
 	"github.com/rollkit/rollkit/store"
 	test "github.com/rollkit/rollkit/test/log"
 	"github.com/rollkit/rollkit/test/mocks"
@@ -46,7 +45,6 @@ func TestAggregatorMode(t *testing.T) {
 	app.On(Commit, mock.Anything).Return(abci.ResponseCommit{})
 
 	key, _, _ := crypto.GenerateEd25519Key(rand.Reader)
-	anotherKey, _, _ := crypto.GenerateEd25519Key(rand.Reader)
 	genesisValidators, signingKey := getGenesisValidatorSetWithSigner(1)
 	blockManagerConfig := config.BlockManagerConfig{
 		BlockTime:   1 * time.Second,
@@ -67,8 +65,6 @@ func TestAggregatorMode(t *testing.T) {
 	}()
 	assert.True(node.IsRunning())
 
-	pid, err := peer.IDFromPrivateKey(anotherKey)
-	require.NoError(err)
 	ctx, cancel = context.WithCancel(context.TODO())
 	defer cancel()
 	go func() {
@@ -77,7 +73,6 @@ func TestAggregatorMode(t *testing.T) {
 			case <-ctx.Done():
 				return
 			default:
-				node.incomingTxCh <- &p2p.GossipMessage{Data: []byte(time.Now().String()), From: pid}
 				time.Sleep(time.Duration(mrand.Uint32()%20) * time.Millisecond) //nolint:gosec
 			}
 		}