From 91e1ceac3833bafd139fd5ac7092ee81b73efc2e Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 18 Sep 2022 19:41:17 +0200 Subject: [PATCH] Calc: fix config validation --- provider/calc.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/provider/calc.go b/provider/calc.go index bf8c4d677..bb1b3c34e 100644 --- a/provider/calc.go +++ b/provider/calc.go @@ -30,12 +30,8 @@ func NewCalcFromConfig(other map[string]interface{}) (IntProvider, error) { o := &calcProvider{} - if len(cc.Add) > 0 && len(cc.Mul) > 0 { - return nil, errors.New("can only have either add or mul") - } - - if len(cc.Add) > 0 || len(cc.Mul) > 0 && cc.Sign != nil { - return nil, errors.New("can only have either add/mul or sign") + if len(cc.Add) > 0 && len(cc.Mul) > 0 || len(cc.Add) > 0 && cc.Sign != nil || len(cc.Mul) > 0 && cc.Sign != nil { + return nil, errors.New("can only have either add, mul or sign") } for idx, cc := range cc.Add {