share capability return validation helpers

Author: mgomes

vibes/capability_common.go

@@ -65,6 +65,19 @@ func validateCapabilityHashValue(label string, val Value) error {
 	return validateCapabilityTypedValue(label, val, capabilityTypeHash)
 }
 
+func capabilityValidateAnyReturn(method string) func(result Value) error {
+	return func(result Value) error {
+		return validateCapabilityTypedValue(method+" return value", result, capabilityTypeAny)
+	}
+}
+
+func cloneCapabilityMethodResult(method string, result Value) (Value, error) {
+	if err := validateCapabilityTypedValue(method+" return value", result, capabilityTypeAny); err != nil {
+		return NewNil(), err
+	}
+	return deepCloneValue(result), nil
+}
+
 func isNilCapabilityImplementation(impl any) bool {
 	if impl == nil {
 		return true

vibes/capability_events.go

@@ -47,7 +47,7 @@ func (c *eventsCapability) CapabilityContracts() map[string]CapabilityMethodCont
 	return map[string]CapabilityMethodContract{
 		method: {
 			ValidateArgs:   c.validatePublishContractArgs,
-			ValidateReturn: c.validateMethodReturn(method),
+			ValidateReturn: capabilityValidateAnyReturn(method),
 		},
 	}
 }
@@ -73,7 +73,7 @@ func (c *eventsCapability) callPublish(exec *Execution, receiver Value, args []V
 	if err != nil {
 		return NewNil(), err
 	}
-	return c.cloneMethodResult(c.name+".publish", result)
+	return cloneCapabilityMethodResult(c.name+".publish", result)
 }
 
 func (c *eventsCapability) validatePublishContractArgs(args []Value, kwargs map[string]Value, block Value) error {
@@ -92,16 +92,3 @@ func (c *eventsCapability) validatePublishContractArgs(args []Value, kwargs map[
 	}
 	return validateCapabilityKwargsDataOnly(method, kwargs)
 }
-
-func (c *eventsCapability) validateMethodReturn(method string) func(result Value) error {
-	return func(result Value) error {
-		return validateCapabilityTypedValue(method+" return value", result, capabilityTypeAny)
-	}
-}
-
-func (c *eventsCapability) cloneMethodResult(method string, result Value) (Value, error) {
-	if err := validateCapabilityTypedValue(method+" return value", result, capabilityTypeAny); err != nil {
-		return NewNil(), err
-	}
-	return deepCloneValue(result), nil
-}