From 08800cb8c6e3115bc2eefbb3980ad352bf25f223 Mon Sep 17 00:00:00 2001 From: Kishan Mohanbhai Sagathiya Date: Wed, 2 Oct 2024 11:51:05 +0530 Subject: [PATCH] addressed some reviews --- .../backing/candidate_backing_test.go | 4 ++-- .../statement_distribution.go | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dot/parachain/backing/candidate_backing_test.go b/dot/parachain/backing/candidate_backing_test.go index 6ec6935493..505f9ebd08 100644 --- a/dot/parachain/backing/candidate_backing_test.go +++ b/dot/parachain/backing/candidate_backing_test.go @@ -11,7 +11,7 @@ import ( availabilitystore "github.com/ChainSafe/gossamer/dot/parachain/availability-store" candidatevalidation "github.com/ChainSafe/gossamer/dot/parachain/candidate-validation" collatorprotocolmessages "github.com/ChainSafe/gossamer/dot/parachain/collator-protocol/messages" - statementedistributionmessages "github.com/ChainSafe/gossamer/dot/parachain/statement-distribution/messages" + statementdistributionmessages "github.com/ChainSafe/gossamer/dot/parachain/statement-distribution/messages" parachaintypes "github.com/ChainSafe/gossamer/dot/parachain/types" "github.com/ChainSafe/gossamer/lib/common" "github.com/ChainSafe/gossamer/lib/crypto/sr25519" @@ -84,7 +84,7 @@ func mockOverseer(t *testing.T, subsystemToOverseer chan any) { parachaintypes.ProvisionerMessageProvisionableData, parachaintypes.ProspectiveParachainsMessageCandidateBacked, collatorprotocolmessages.Backed, - statementedistributionmessages.Backed: + statementdistributionmessages.Backed: continue default: t.Errorf("unknown type: %T\n", data) diff --git a/dot/parachain/statement-distribution/statement_distribution.go b/dot/parachain/statement-distribution/statement_distribution.go index 88f3670f47..e9d01812db 100644 --- a/dot/parachain/statement-distribution/statement_distribution.go +++ b/dot/parachain/statement-distribution/statement_distribution.go @@ -15,11 +15,20 @@ type StatementDistribution struct { } func (s StatementDistribution) Run(ctx context.Context, overseerToSubSystem <-chan any) { - - for msg := range overseerToSubSystem { - err := s.processMessage(msg) - if err != nil { - logger.Errorf("processing overseer message: %w", err) + for { + select { + case msg, ok := <-overseerToSubSystem: + if !ok { + return + } + err := s.processMessage(msg) + if err != nil { + logger.Errorf("processing overseer message: %w", err) + } + case <-ctx.Done(): + if err := ctx.Err(); err != nil { + logger.Errorf("ctx error: %v\n", err) + } } } }