From e1896a876d2716f2aec59a855fab83ed5f77ffb2 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Thu, 21 Sep 2023 08:09:22 -0500 Subject: [PATCH] core/services/relay: fix backwards maps.Copy (#10745) * core/services/relay: fix backwards maps.Copy * fix Base health report --- core/services/relay/relay.go | 4 ++-- plugins/plugin.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/services/relay/relay.go b/core/services/relay/relay.go index c96abb4b8c8..75ced101b3f 100644 --- a/core/services/relay/relay.go +++ b/core/services/relay/relay.go @@ -133,8 +133,8 @@ func (r *relayerAdapter) Ready() (err error) { func (r *relayerAdapter) HealthReport() map[string]error { hr := make(map[string]error) - maps.Copy(r.Relayer.HealthReport(), hr) - maps.Copy(r.RelayerExt.HealthReport(), hr) + maps.Copy(hr, r.Relayer.HealthReport()) + maps.Copy(hr, r.RelayerExt.HealthReport()) return hr } diff --git a/plugins/plugin.go b/plugins/plugin.go index dff3345efd3..0b93ef26f5c 100644 --- a/plugins/plugin.go +++ b/plugins/plugin.go @@ -32,7 +32,7 @@ func (p *Base) HealthReport() map[string]error { p.mu.RLock() defer p.mu.RUnlock() for _, s := range p.srvs { - maps.Copy(s.HealthReport(), hr) + maps.Copy(hr, s.HealthReport()) } return hr }