From 3b148d2b88662b820e2017c4a87657af97cc5c01 Mon Sep 17 00:00:00 2001 From: Erin Swenson-Healey Date: Fri, 1 Jun 2018 15:54:17 -0700 Subject: [PATCH] make Protocols variadic, for usability --- dht_test.go | 3 +-- opts/options.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dht_test.go b/dht_test.go index e38026711..b19861217 100644 --- a/dht_test.go +++ b/dht_test.go @@ -13,7 +13,6 @@ import ( opts "github.com/libp2p/go-libp2p-kad-dht/opts" pb "github.com/libp2p/go-libp2p-kad-dht/pb" - "github.com/libp2p/go-libp2p-protocol" cid "github.com/ipfs/go-cid" u "github.com/ipfs/go-ipfs-util" @@ -1082,7 +1081,7 @@ func TestGetSetPluggedProtocol(t *testing.T) { defer cancel() os := []opts.Option{ - opts.Protocols([]protocol.ID{"/esh/dht"}), + opts.Protocols("/esh/dht"), opts.Client(false), opts.NamespacedValidator("v", blankValidator{}), } diff --git a/opts/options.go b/opts/options.go index d07c90220..164f39329 100644 --- a/opts/options.go +++ b/opts/options.go @@ -96,7 +96,7 @@ func NamespacedValidator(ns string, v record.Validator) Option { // Protocols sets the protocols for the DHT // // Defaults to dht.DefaultProtocols -func Protocols(protocols []protocol.ID) Option { +func Protocols(protocols ...protocol.ID) Option { return func(o *Options) error { o.Protocols = protocols return nil