@cryptotaxi247 / kubo / commits / 3a12454c9

constructor: libp2p simpleOpts

License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>

Łukasz Magiera committed Apr 29, 2019 at 23:45 UTC 3a12454c952ea191a803eca305213ed4ac20acce
1 file changed +12 -20
core/node/libp2p/libp2p.go
+12 -20
@@ -280,6 +280,11 @@ func makeSmuxTransportOption(mplexExp bool) libp2p.Option {
280 return libp2p.ChainOptions(opts...)
281 }
282
283 +var NatPortMap = simpleOpt(libp2p.NATPortMap())
284 +var AutoRealy = simpleOpt(libp2p.EnableAutoRelay())
285 +var DefaultTransports = simpleOpt(libp2p.DefaultTransports)
286 +var QUIC = simpleOpt(libp2p.Transport(libp2pquic.NewTransport))
287 +
288 func SmuxTransport(mplex bool) func() (opts Libp2pOpts, err error) {
289 return func() (opts Libp2pOpts, err error) {
290 opts.Opts = append(opts.Opts, makeSmuxTransportOption(mplex))
@@ -287,11 +292,6 @@ func SmuxTransport(mplex bool) func() (opts Libp2pOpts, err error) {
292 }
293 }
294
290 -func NatPortMap() (opts Libp2pOpts, err error) {
291 - opts.Opts = append(opts.Opts, libp2p.NATPortMap())
292 - return
293 -}
294 -
295 func Relay(disable, enableHop bool) func() (opts Libp2pOpts, err error) {
296 return func() (opts Libp2pOpts, err error) {
297 if disable {
@@ -308,21 +308,6 @@ func Relay(disable, enableHop bool) func() (opts Libp2pOpts, err error) {
308 }
309 }
310
311 -func AutoRealy() (opts Libp2pOpts, err error) {
312 - opts.Opts = append(opts.Opts, libp2p.EnableAutoRelay())
313 - return
314 -}
315 -
316 -func DefaultTransports() (opts Libp2pOpts, err error) {
317 - opts.Opts = append(opts.Opts, libp2p.DefaultTransports)
318 - return
319 -}
320 -
321 -func QUIC() (opts Libp2pOpts, err error) {
322 - opts.Opts = append(opts.Opts, libp2p.Transport(libp2pquic.NewTransport))
323 - return
324 -}
325 -
311 func Security(enabled, preferTLS bool) interface{} {
312 if !enabled {
313 return func() (opts Libp2pOpts) {
@@ -555,3 +540,10 @@ func StartListening(addresses []string) func(host host.Host) error {
540 return nil
541 }
542 }
543 +
544 +func simpleOpt(opt libp2p.Option) func() (opts Libp2pOpts, err error) {
545 + return func() (opts Libp2pOpts, err error) {
546 + opts.Opts = append(opts.Opts, opt)
547 + return
548 + }
549 +}