From 4d989a0acd9b4bf336e863af44ce0fd807ad43c8 Mon Sep 17 00:00:00 2001 From: Danny Skubak <8206446+skubakdj@users.noreply.github.com> Date: Wed, 13 Sep 2023 10:38:29 -0400 Subject: [PATCH] Make error numbers sequential --- core/services/chainlink/config.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/services/chainlink/config.go b/core/services/chainlink/config.go index b960eeae8f0..5578f8c0453 100644 --- a/core/services/chainlink/config.go +++ b/core/services/chainlink/config.go @@ -129,24 +129,24 @@ func (s *Secrets) SetFrom(f *Secrets) (err error) { err = multierr.Append(err, config.NamedMultiErrorList(err1, "Database")) } - if err3 := s.Password.SetFrom(&f.Password); err3 != nil { - err = multierr.Append(err, config.NamedMultiErrorList(err3, "Password")) + if err2 := s.Password.SetFrom(&f.Password); err2 != nil { + err = multierr.Append(err, config.NamedMultiErrorList(err2, "Password")) } - if err4 := s.Pyroscope.SetFrom(&f.Pyroscope); err4 != nil { - err = multierr.Append(err, config.NamedMultiErrorList(err4, "Pyroscope")) + if err3 := s.Pyroscope.SetFrom(&f.Pyroscope); err3 != nil { + err = multierr.Append(err, config.NamedMultiErrorList(err3, "Pyroscope")) } - if err5 := s.Prometheus.SetFrom(&f.Prometheus); err5 != nil { - err = multierr.Append(err, config.NamedMultiErrorList(err5, "Prometheus")) + if err4 := s.Prometheus.SetFrom(&f.Prometheus); err4 != nil { + err = multierr.Append(err, config.NamedMultiErrorList(err4, "Prometheus")) } - if err6 := s.Mercury.SetFrom(&f.Mercury); err6 != nil { - err = multierr.Append(err, config.NamedMultiErrorList(err6, "Mercury")) + if err5 := s.Mercury.SetFrom(&f.Mercury); err5 != nil { + err = multierr.Append(err, config.NamedMultiErrorList(err5, "Mercury")) } - if err7 := s.Threshold.SetFrom(&f.Threshold); err7 != nil { - err = multierr.Append(err, config.NamedMultiErrorList(err7, "Threshold")) + if err6 := s.Threshold.SetFrom(&f.Threshold); err6 != nil { + err = multierr.Append(err, config.NamedMultiErrorList(err6, "Threshold")) } _, err = utils.MultiErrorList(err)