From 87e5acde14cbdba29ab1c58313ba79ac6d68af04 Mon Sep 17 00:00:00 2001 From: Connor O'Hara Date: Thu, 23 Mar 2023 12:02:22 +0100 Subject: [PATCH 1/5] build first block --- block/manager.go | 1 - 1 file changed, 1 deletion(-) diff --git a/block/manager.go b/block/manager.go index 3e0341560a..44ceffa3b9 100644 --- a/block/manager.go +++ b/block/manager.go @@ -216,7 +216,6 @@ func (m *Manager) AggregationLoop(ctx context.Context, lazy bool) { } } } else { - <-timer.C for { select { case <-ctx.Done(): From d3103e9d2b77d8b7ec36a5abc9bdaad28bbbf26a Mon Sep 17 00:00:00 2001 From: Connor O'Hara Date: Thu, 23 Mar 2023 16:07:09 +0100 Subject: [PATCH 2/5] try to fix lazy agg --- block/manager.go | 6 ++++++ node/full.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/block/manager.go b/block/manager.go index 44ceffa3b9..c264a05e93 100644 --- a/block/manager.go +++ b/block/manager.go @@ -216,6 +216,12 @@ func (m *Manager) AggregationLoop(ctx context.Context, lazy bool) { } } } else { + // build initial block + m.logger.Info("Building a freakin' block") + err := m.publishBlock(ctx) + if err != nil { + m.logger.Info("Failed to build the freakin' block") + } for { select { case <-ctx.Done(): diff --git a/node/full.go b/node/full.go index 330e11e4c0..d2cb7a452a 100644 --- a/node/full.go +++ b/node/full.go @@ -263,7 +263,7 @@ func (n *FullNode) OnStart() error { return fmt.Errorf("error while starting data availability layer client: %w", err) } if n.conf.Aggregator { - n.Logger.Info("working in aggregator mode", "block time", n.conf.BlockTime) + n.Logger.Info("working in aggregator mode changed!!!", "block time", n.conf.BlockTime) go n.blockManager.AggregationLoop(n.ctx, n.conf.LazyAggregator) go n.headerPublishLoop(n.ctx) } From 1f578221fc4f910610e7a2fe5927dd8949e385ec Mon Sep 17 00:00:00 2001 From: Connor O'Hara Date: Thu, 23 Mar 2023 17:29:05 +0100 Subject: [PATCH 3/5] remove unnecessary --- block/manager.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/block/manager.go b/block/manager.go index c264a05e93..90517f7f62 100644 --- a/block/manager.go +++ b/block/manager.go @@ -217,11 +217,6 @@ func (m *Manager) AggregationLoop(ctx context.Context, lazy bool) { } } else { // build initial block - m.logger.Info("Building a freakin' block") - err := m.publishBlock(ctx) - if err != nil { - m.logger.Info("Failed to build the freakin' block") - } for { select { case <-ctx.Done(): From a0fd8d6dddbb49e443ec5f55046c7f33d7da18bf Mon Sep 17 00:00:00 2001 From: Connor O'Hara Date: Thu, 23 Mar 2023 17:30:52 +0100 Subject: [PATCH 4/5] cleanup --- block/manager.go | 1 - node/full.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/block/manager.go b/block/manager.go index 90517f7f62..44ceffa3b9 100644 --- a/block/manager.go +++ b/block/manager.go @@ -216,7 +216,6 @@ func (m *Manager) AggregationLoop(ctx context.Context, lazy bool) { } } } else { - // build initial block for { select { case <-ctx.Done(): diff --git a/node/full.go b/node/full.go index d2cb7a452a..330e11e4c0 100644 --- a/node/full.go +++ b/node/full.go @@ -263,7 +263,7 @@ func (n *FullNode) OnStart() error { return fmt.Errorf("error while starting data availability layer client: %w", err) } if n.conf.Aggregator { - n.Logger.Info("working in aggregator mode changed!!!", "block time", n.conf.BlockTime) + n.Logger.Info("working in aggregator mode", "block time", n.conf.BlockTime) go n.blockManager.AggregationLoop(n.ctx, n.conf.LazyAggregator) go n.headerPublishLoop(n.ctx) } From ee34f7f93a86a65dbf2e7d57b83bab39ba4dbfd6 Mon Sep 17 00:00:00 2001 From: Connor O'Hara Date: Thu, 23 Mar 2023 17:48:28 +0100 Subject: [PATCH 5/5] add offset to fix lazy agg test --- node/full_node_integration_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/node/full_node_integration_test.go b/node/full_node_integration_test.go index 0327aeff2e..d98d3e2201 100644 --- a/node/full_node_integration_test.go +++ b/node/full_node_integration_test.go @@ -177,17 +177,17 @@ func TestLazyAggregator(t *testing.T) { _, err = client.BroadcastTxCommit(context.Background(), []byte{0, 0, 0, 1}) assert.NoError(err) time.Sleep(2 * time.Second) - assert.Equal(node.(*FullNode).Store.Height(), uint64(1)) + assert.Equal(node.(*FullNode).Store.Height(), uint64(2)) _, err = client.BroadcastTxCommit(context.Background(), []byte{0, 0, 0, 2}) assert.NoError(err) time.Sleep(2 * time.Second) - assert.Equal(node.(*FullNode).Store.Height(), uint64(2)) + assert.Equal(node.(*FullNode).Store.Height(), uint64(3)) _, err = client.BroadcastTxCommit(context.Background(), []byte{0, 0, 0, 3}) assert.NoError(err) time.Sleep(2 * time.Second) - assert.Equal(node.(*FullNode).Store.Height(), uint64(3)) + assert.Equal(node.(*FullNode).Store.Height(), uint64(4)) }