Component: better waiting for inputs api

component/component.go

@@ -102,10 +102,10 @@ func (c *Component) MaybeActivate() (activationResult *ActivationResult) {
 	//Run the computation
 	err := c.f(c.inputs, c.outputs)
 
-	if IsWaitingForInputError(err) {
+	if errors.Is(err, errWaitingForInputs) {
 		activationResult = c.newActivationCodeWaitingForInput()
 
-		if !errors.Is(err, ErrWaitingForInputKeepInputs) {
+		if !errors.Is(err, errWaitingForInputsKeep) {
 			c.inputs.ClearSignal()
 		}
 

component/component_test.go

@@ -420,7 +420,7 @@ func TestComponent_MaybeActivate(t *testing.T) {
 					WithActivationFunc(func(inputs port.Collection, outputs port.Collection) error {
 
 						if !inputs.ByNames("i1", "i2").AllHaveSignal() {
-							return ErrWaitingForInputResetInputs
+							return NewErrWaitForInputs(false)
 						}
 
 						return nil
@@ -432,14 +432,35 @@ func TestComponent_MaybeActivate(t *testing.T) {
 				WithActivationCode(ActivationCodeNoInput),
 		},
 		{
-			name: "component is waiting for input",
+			name: "component is waiting for input, reset inputs",
 			getComponent: func() *Component {
 				c := NewComponent("c1").
 					WithInputs("i1", "i2").
 					WithActivationFunc(func(inputs port.Collection, outputs port.Collection) error {
 
 						if !inputs.ByNames("i1", "i2").AllHaveSignal() {
-							return ErrWaitingForInputResetInputs
+							return NewErrWaitForInputs(false)
+						}
+
+						return nil
+					})
+				//Only one input set
+				c.Inputs().ByName("i1").PutSignal(signal.New(123))
+				return c
+			},
+			wantActivationResult: NewActivationResult("c1").
+				SetActivated(false).
+				WithActivationCode(ActivationCodeWaitingForInput),
+		},
+		{
+			name: "component is waiting for input, keep inputs",
+			getComponent: func() *Component {
+				c := NewComponent("c1").
+					WithInputs("i1", "i2").
+					WithActivationFunc(func(inputs port.Collection, outputs port.Collection) error {
+
+						if !inputs.ByNames("i1", "i2").AllHaveSignal() {
+							return NewErrWaitForInputs(true)
 						}
 
 						return nil

component/errors.go

@@ -1,13 +1,19 @@
 package component
 
-import "errors"
+import (
+	"errors"
+	"fmt"
+)
 
 var (
-	//@TODO: provide wrapper methods so exact input can be specified within error
-	ErrWaitingForInputResetInputs = errors.New("component is waiting for one or more inputs. All inputs will be reset")
-	ErrWaitingForInputKeepInputs  = errors.New("component is waiting for one or more inputs. All inputs will be kept")
+	errWaitingForInputs     = errors.New("component is waiting for some inputs")
+	errWaitingForInputsKeep = fmt.Errorf("%w: do not clear input ports", errWaitingForInputs)
 )
 
-func IsWaitingForInputError(err error) bool {
-	return errors.Is(err, ErrWaitingForInputResetInputs) || errors.Is(err, ErrWaitingForInputKeepInputs)
+// NewErrWaitForInputs returns respective error
+func NewErrWaitForInputs(keepInputs bool) error {
+	if keepInputs {
+		return errWaitingForInputsKeep
+	}
+	return errWaitingForInputs
 }

fmesh_test.go

@@ -669,7 +669,7 @@ func TestFMesh_runCycle(t *testing.T) {
 					WithOutputs("o1").
 					WithActivationFunc(func(inputs port.Collection, outputs port.Collection) error {
 						if !inputs.ByNames("i1", "i2").AllHaveSignal() {
-							return component.ErrWaitingForInputKeepInputs
+							return component.NewErrWaitForInputs(true)
 						}
 						return nil
 					}),