Rewrite constructor to functional opts

This commit is contained in:
Łukasz Magiera
2019-07-04 19:34:06 +02:00
parent f08263662f
commit de604065fb
4 changed files with 260 additions and 140 deletions
+18 -17
View File
@@ -3,9 +3,8 @@ package lp2p
import (
"fmt"
"github.com/filecoin-project/go-lotus/node/config"
"github.com/libp2p/go-libp2p"
host "github.com/libp2p/go-libp2p-core/host"
"github.com/libp2p/go-libp2p-core/host"
p2pbhost "github.com/libp2p/go-libp2p/p2p/host/basic"
mafilter "github.com/libp2p/go-maddr-filter"
ma "github.com/multiformats/go-multiaddr"
@@ -95,22 +94,24 @@ func listenAddresses(addresses []string) ([]ma.Multiaddr, error) {
return listen, nil
}
func StartListening(host host.Host, cfg *config.Root) error {
listenAddrs, err := listenAddresses(cfg.Libp2p.ListenAddresses)
if err != nil {
return err
}
func StartListening(addresses []string) func(host host.Host) error {
return func(host host.Host) error {
listenAddrs, err := listenAddresses(addresses)
if err != nil {
return err
}
// Actually start listening:
if err := host.Network().Listen(listenAddrs...); err != nil {
return err
}
// Actually start listening:
if err := host.Network().Listen(listenAddrs...); err != nil {
return err
}
// list out our addresses
addrs, err := host.Network().InterfaceListenAddresses()
if err != nil {
return err
// list out our addresses
addrs, err := host.Network().InterfaceListenAddresses()
if err != nil {
return err
}
log.Infof("Swarm listening at: %s", addrs)
return nil
}
log.Infof("Swarm listening at: %s", addrs)
return nil
}