From 292bf7a0013e2772a5de6be78552d316b25c443d Mon Sep 17 00:00:00 2001 From: Cedric Fung Date: Wed, 22 May 2024 11:15:32 +0000 Subject: [PATCH] improve relayer peer choice --- p2p/handle.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/p2p/handle.go b/p2p/handle.go index 82346c2b5..d8c1bc9ff 100644 --- a/p2p/handle.go +++ b/p2p/handle.go @@ -448,24 +448,17 @@ func (me *Peer) relayOrHandlePeerMessage(relayerId crypto.Hash, msg *PeerMessage if me.relayer == nil { return nil } - data := append([]byte{PeerMessageTypeRelay}, msg.Data...) peer := me.consumers.Get(to) if peer == nil { peer = me.relayers.Get(to) } - if peer != nil { - rk := crypto.Blake3Hash(append(msg.Data, to[:]...)) - rk = crypto.Blake3Hash(append(rk[:], relayerId[:]...)) - success, _ := peer.offer(MsgPriorityNormal, &ChanMsg{rk[:], data}) - if !success { - return fmt.Errorf("peer.offer(%s) consumer timeout", peer.IdForNetwork) - } - return nil + if peer == nil { + peer = me.remoteRelayers.Get(to) } - peer = me.remoteRelayers.Get(to) if peer == nil || peer.IdForNetwork == relayerId { return nil } + data := append([]byte{PeerMessageTypeRelay}, msg.Data...) rk := crypto.Blake3Hash(append(msg.Data, to[:]...)) rk = crypto.Blake3Hash(append(rk[:], relayerId[:]...)) success, _ := peer.offer(MsgPriorityNormal, &ChanMsg{rk[:], data})