From 42439a623ef27020d97c6caa5ebdde191dec56e1 Mon Sep 17 00:00:00 2001 From: dimkouv Date: Fri, 4 Oct 2024 14:43:29 +0300 Subject: [PATCH] use services.CloseAll --- core/capabilities/ccip/oraclecreator/wrapped_oracle.go | 8 +++----- .../ccip/oraclecreator/wrapped_oracle_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/capabilities/ccip/oraclecreator/wrapped_oracle.go b/core/capabilities/ccip/oraclecreator/wrapped_oracle.go index 427c3777050..0ecde57dac3 100644 --- a/core/capabilities/ccip/oraclecreator/wrapped_oracle.go +++ b/core/capabilities/ccip/oraclecreator/wrapped_oracle.go @@ -5,6 +5,8 @@ import ( "fmt" "io" + "github.com/smartcontractkit/chainlink-common/pkg/services" + cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types" ) @@ -34,11 +36,7 @@ func (o *wrappedOracle) Close() error { errs = append(errs, fmt.Errorf("close base oracle: %w", err)) } - for _, closer := range o.closableResources { - if err := closer.Close(); err != nil { - errs = append(errs, fmt.Errorf("close resource: %w", err)) - } - } + errs = append(errs, services.CloseAll(o.closableResources...)) return errors.Join(errs...) } diff --git a/core/capabilities/ccip/oraclecreator/wrapped_oracle_test.go b/core/capabilities/ccip/oraclecreator/wrapped_oracle_test.go index be38ed20814..062ed8d56c8 100644 --- a/core/capabilities/ccip/oraclecreator/wrapped_oracle_test.go +++ b/core/capabilities/ccip/oraclecreator/wrapped_oracle_test.go @@ -27,14 +27,14 @@ func Test_wrappedOracle_Close(t *testing.T) { { name: "oracle and closers errors", oracleErr: err1, - closerErrors: []error{err2, nil, err3}, - expectedErr: errors.New("close base oracle: err1\nclose resource: err2\nclose resource: err3"), + closerErrors: []error{nil, nil, err3}, + expectedErr: errors.New("close base oracle: err1\nerr3"), }, { name: "closers only errors", oracleErr: nil, - closerErrors: []error{err2, nil, err3}, - expectedErr: errors.New("close resource: err2\nclose resource: err3"), + closerErrors: []error{nil, err2, nil}, + expectedErr: err2, }, { name: "no errors with closers",