make filterRelayAddrs a named function, not a closure
License: MIT Signed-off-by: vyzo <vyzo@hackzen.org>
vyzo committed
Aug 16, 2017 at 09:43 UTC
b6150b2f06427dc5575fa49a4d1100656b941f91
1 file changed
+14
-14
core/core.go
+14
-14
@@ -819,22 +819,10 @@ func constructPeerHost(ctx context.Context, id peer.ID, ps pstore.Peerstore, bwr
819
820
addrsFactory := opts.AddrsFactory
821
if !opts.DisableRelay {
822
- filterRelayAddr := func(addrs []ma.Multiaddr) []ma.Multiaddr {
823
- var raddrs []ma.Multiaddr
824
- for _, addr := range addrs {
825
- _, err := addr.ValueForProtocol(circuit.P_CIRCUIT)
826
- if err == nil {
827
- continue
828
- }
829
- raddrs = append(raddrs, addr)
830
- }
831
- return raddrs
832
- }
833
-
822
if addrsFactory != nil {
835
- addrsFactory = composeAddrsFactory(addrsFactory, filterRelayAddr)
823
+ addrsFactory = composeAddrsFactory(addrsFactory, filterRelayAddrs)
824
} else {
837
- addrsFactory = filterRelayAddr
825
+ addrsFactory = filterRelayAddrs
826
}
827
}
828
@@ -860,6 +848,18 @@ func constructPeerHost(ctx context.Context, id peer.ID, ps pstore.Peerstore, bwr
848
return host, nil
849
}
850
851
+func filterRelayAddrs(addrs []ma.Multiaddr) []ma.Multiaddr {
852
+ var raddrs []ma.Multiaddr
853
+ for _, addr := range addrs {
854
+ _, err := addr.ValueForProtocol(circuit.P_CIRCUIT)
855
+ if err == nil {
856
+ continue
857
+ }
858
+ raddrs = append(raddrs, addr)
859
+ }
860
+ return raddrs
861
+}
862
+
863
func composeAddrsFactory(f, g p2pbhost.AddrsFactory) p2pbhost.AddrsFactory {
864
return func(addrs []ma.Multiaddr) []ma.Multiaddr {
865
return f(g(addrs))