more smaller changes

ChainSafe · Dec 14, 2023 · ad4f350 · ad4f350
1 parent 9150f0d
commit ad4f350
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/dot/parachain/collator-protocol/validator_side.go b/dot/parachain/collator-protocol/validator_side.go
@@ -83,6 +83,11 @@ func (cpvs CollatorProtocolValidatorSide) Run(
 				cpvs.fetchedCollations = append(cpvs.fetchedCollations, *collation)
 			}
 
+		case <-cpvs.ctx.Done():
+			if err := cpvs.ctx.Err(); err != nil {
+				logger.Errorf("ctx error: %v\n", err)
+			}
+			return nil
 		}
 	}
 }
@@ -95,6 +100,10 @@ func (cpvs CollatorProtocolValidatorSide) ProcessOverseerSignals() {
 	// NOTE: nothing to do here
 }
 
+func (cpvs CollatorProtocolValidatorSide) Stop() {
+	cpvs.cancel()
+}
+
 // requestCollation requests a collation from the network.
 // This function will
 // - check for duplicate requests
@@ -295,6 +304,9 @@ type CollationEvent struct {
 }
 
 type CollatorProtocolValidatorSide struct {
+	ctx    context.Context
+	cancel context.CancelFunc
+
 	net Network
 
 	SubSystemToOverseer chan<- any

diff --git a/dot/parachain/overseer/overseer_test.go b/dot/parachain/overseer/overseer_test.go
@@ -54,6 +54,8 @@ func (s *TestSubsystem) String() parachaintypes.SubSystemName {
 	return parachaintypes.SubSystemName(s.name)
 }
 
+func (s *TestSubsystem) Stop() {}
+
 func TestStart2SubsytemsActivate1(t *testing.T) {
 	ctrl := gomock.NewController(t)
 

diff --git a/dot/parachain/overseer/types.go b/dot/parachain/overseer/types.go
@@ -37,4 +37,5 @@ type Subsystem interface {
 	Run(ctx context.Context, OverseerToSubSystem chan any, SubSystemToOverseer chan any) error
 	Name() parachaintypes.SubSystemName
 	ProcessOverseerSignals()
+	Stop()
 }