fluencelabs/go-libp2p-kad-dht
1
0
Fork 0
mirror of https://github.com/fluencelabs/go-libp2p-kad-dht synced 2025-05-23 11:11:21 +00:00
Code Issues Projects Releases Wiki Activity

fix(options): make the disable providers/values options consistent

Browse Source
This commit is contained in:
Steven Allen 2019-12-06 09:47:22 -05:00
parent ba86f51884
commit 2a39785d3f
3 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dht_test.go
View File

@ -1430,8 +1430,18 @@ func TestProvideDisabled(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
dhtA := setupDHT(ctx, t, false, opts.EnableProviders(enabledA)) var (
dhtB := setupDHT(ctx, t, false, opts.EnableProviders(enabledB)) optsA, optsB []opts.Option
)
if !enabledA {
optsA = append(optsA, opts.DisableProviders())
}
if !enabledB {
optsB = append(optsB, opts.DisableProviders())
}
dhtA := setupDHT(ctx, t, false, optsA...)
dhtB := setupDHT(ctx, t, false, optsB...)
defer dhtA.Close() defer dhtA.Close()
defer dhtB.Close() defer dhtB.Close()

16
opts/options.go
View File

@ -182,28 +182,28 @@ func DisableAutoRefresh() Option {
} }
} }
// EnableProviders enables storing and retrieving provider records. // DisableProviders disables storing and retrieving provider records.
// //
// Defaults to true. // Defaults to enabled.
// //
// WARNING: do not change this unless you're using a forked DHT (i.e., a private // WARNING: do not change this unless you're using a forked DHT (i.e., a private
// network and/or distinct DHT protocols with the `Protocols` option). // network and/or distinct DHT protocols with the `Protocols` option).
func EnableProviders(enable bool) Option { func DisableProviders() Option {
return func(o *Options) error { return func(o *Options) error {
o.EnableProviders = enable o.EnableProviders = false
return nil return nil
} }
} }
// EnableValues enables storing and retrieving value records. // DisableProviders disables storing and retrieving value records.
// //
// Defaults to true. // Defaults to enabled.
// //
// WARNING: do not change this unless you're using a forked DHT (i.e., a private // WARNING: do not change this unless you're using a forked DHT (i.e., a private
// network and/or distinct DHT protocols with the `Protocols` option). // network and/or distinct DHT protocols with the `Protocols` option).
func EnableValues(enable bool) Option { func DisableValues() Option {
return func(o *Options) error { return func(o *Options) error {
o.EnableValues = enable o.EnableValues = false
return nil return nil
} }
} }

14
records_test.go
View File

@ -317,8 +317,18 @@ func TestValuesDisabled(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
dhtA := setupDHT(ctx, t, false, dhtopt.EnableValues(enabledA)) var (
dhtB := setupDHT(ctx, t, false, dhtopt.EnableValues(enabledB)) optsA, optsB []dhtopt.Option
)
if !enabledA {
optsA = append(optsA, dhtopt.DisableValues())
}
if !enabledB {
optsB = append(optsB, dhtopt.DisableValues())
}
dhtA := setupDHT(ctx, t, false, optsA...)
dhtB := setupDHT(ctx, t, false, optsB...)
defer dhtA.Close() defer dhtA.Close()
defer dhtB.Close() defer dhtB.Close()