From 2ecdbae987c1fbc749ab56f692512fb5e7832207 Mon Sep 17 00:00:00 2001 From: LINCKODE Date: Mon, 29 Jul 2024 13:31:46 +0300 Subject: [PATCH 1/4] Fix empty tick check. --- validator/tick/empty_tick.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/validator/tick/empty_tick.go b/validator/tick/empty_tick.go index b6c3c66..336f07b 100644 --- a/validator/tick/empty_tick.go +++ b/validator/tick/empty_tick.go @@ -24,6 +24,7 @@ func CalculateEmptyTicksForEpoch(ctx context.Context, ps *store.PebbleStore, epo var emptyTicks uint32 for _, interval := range e.Intervals { + fmt.Printf("Interbal: %d -> %d\n", interval.InitialProcessedTick, interval.LastProcessedTick) for tickOffset := range interval.LastProcessedTick - interval.InitialProcessedTick + 1 { tickNumber := tickOffset + interval.InitialProcessedTick @@ -33,7 +34,7 @@ func CalculateEmptyTicksForEpoch(ctx context.Context, ps *store.PebbleStore, epo } if CheckIfTickIsEmptyProto(tickData) { - fmt.Printf("Found empty tick.\n") + fmt.Printf("Found empty tick: %d\n", tickNumber) emptyTicks += 1 continue } @@ -45,7 +46,7 @@ func CalculateEmptyTicksForEpoch(ctx context.Context, ps *store.PebbleStore, epo } func CheckIfTickIsEmptyProto(tickData *protobuff.TickData) bool { - if tickData == nil { + if tickData == nil || tickData.VarStruct == nil { return true } From ae7604ba8a99a309e8e347b70d0346cc1fb1c922 Mon Sep 17 00:00:00 2001 From: LINCKODE Date: Mon, 29 Jul 2024 13:32:15 +0300 Subject: [PATCH 2/4] Fix typo --- validator/tick/empty_tick.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validator/tick/empty_tick.go b/validator/tick/empty_tick.go index 336f07b..dd885c3 100644 --- a/validator/tick/empty_tick.go +++ b/validator/tick/empty_tick.go @@ -24,7 +24,7 @@ func CalculateEmptyTicksForEpoch(ctx context.Context, ps *store.PebbleStore, epo var emptyTicks uint32 for _, interval := range e.Intervals { - fmt.Printf("Interbal: %d -> %d\n", interval.InitialProcessedTick, interval.LastProcessedTick) + fmt.Printf("Interval: %d -> %d\n", interval.InitialProcessedTick, interval.LastProcessedTick) for tickOffset := range interval.LastProcessedTick - interval.InitialProcessedTick + 1 { tickNumber := tickOffset + interval.InitialProcessedTick From 9f775b9b2364c374b199fee157063c30d68542d9 Mon Sep 17 00:00:00 2001 From: LINCKODE Date: Mon, 29 Jul 2024 13:38:27 +0300 Subject: [PATCH 3/4] Fix empty tick check --- validator/tick/empty_tick.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/validator/tick/empty_tick.go b/validator/tick/empty_tick.go index dd885c3..26b50b1 100644 --- a/validator/tick/empty_tick.go +++ b/validator/tick/empty_tick.go @@ -7,6 +7,7 @@ import ( "github.com/qubic/go-archiver/protobuff" "github.com/qubic/go-archiver/store" "github.com/qubic/go-node-connector/types" + "google.golang.org/protobuf/proto" ) func CalculateEmptyTicksForEpoch(ctx context.Context, ps *store.PebbleStore, epoch uint32) (uint32, error) { @@ -46,7 +47,8 @@ func CalculateEmptyTicksForEpoch(ctx context.Context, ps *store.PebbleStore, epo } func CheckIfTickIsEmptyProto(tickData *protobuff.TickData) bool { - if tickData == nil || tickData.VarStruct == nil { + + if tickData == nil || proto.Equal(tickData, &protobuff.TickData{}) { return true } From 32e366f6b24df5329426b5964d3762adf0cb8d8c Mon Sep 17 00:00:00 2001 From: LINCKODE Date: Mon, 29 Jul 2024 13:41:29 +0300 Subject: [PATCH 4/4] Fix empty tick check --- validator/tick/empty_tick.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/validator/tick/empty_tick.go b/validator/tick/empty_tick.go index 26b50b1..eccb6ce 100644 --- a/validator/tick/empty_tick.go +++ b/validator/tick/empty_tick.go @@ -10,6 +10,8 @@ import ( "google.golang.org/protobuf/proto" ) +var emptyTickData = &protobuff.TickData{} + func CalculateEmptyTicksForEpoch(ctx context.Context, ps *store.PebbleStore, epoch uint32) (uint32, error) { epochs, err := ps.GetProcessedTickIntervals(ctx) @@ -48,7 +50,7 @@ func CalculateEmptyTicksForEpoch(ctx context.Context, ps *store.PebbleStore, epo func CheckIfTickIsEmptyProto(tickData *protobuff.TickData) bool { - if tickData == nil || proto.Equal(tickData, &protobuff.TickData{}) { + if tickData == nil || proto.Equal(tickData, emptyTickData) { return true }