From 7a1099dfa8aaa79d0e511f0ec778fec29a4b510d Mon Sep 17 00:00:00 2001 From: lash Date: Thu, 18 Jan 2018 22:28:07 +0100 Subject: [PATCH 1/3] swarm/storage/mock: Omit test on <1.8 --- swarm/storage/mock/test/test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swarm/storage/mock/test/test.go b/swarm/storage/mock/test/test.go index 402634aa54..19af0a27bb 100644 --- a/swarm/storage/mock/test/test.go +++ b/swarm/storage/mock/test/test.go @@ -1,3 +1,5 @@ +// +build 1.8 +// // Copyright 2018 The go-ethereum Authors // This file is part of the go-ethereum library. // From 73ed8efc82e61e5697a66b0928b1d4fdc630aedb Mon Sep 17 00:00:00 2001 From: lash Date: Fri, 19 Jan 2018 00:36:19 +0100 Subject: [PATCH 2/3] swarm/storage/mock: Correct build tag in wrong dir --- swarm/storage/mock/db/db_test.go | 2 ++ swarm/storage/mock/test/test.go | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/swarm/storage/mock/db/db_test.go b/swarm/storage/mock/db/db_test.go index 2855e2f298..782faaf35c 100644 --- a/swarm/storage/mock/db/db_test.go +++ b/swarm/storage/mock/db/db_test.go @@ -1,3 +1,5 @@ +// +build go1.8 +// // Copyright 2018 The go-ethereum Authors // This file is part of the go-ethereum library. // diff --git a/swarm/storage/mock/test/test.go b/swarm/storage/mock/test/test.go index 19af0a27bb..402634aa54 100644 --- a/swarm/storage/mock/test/test.go +++ b/swarm/storage/mock/test/test.go @@ -1,5 +1,3 @@ -// +build 1.8 -// // Copyright 2018 The go-ethereum Authors // This file is part of the go-ethereum library. // From 3ef02ccdbdd67be198e0398e82e67c7489378d40 Mon Sep 17 00:00:00 2001 From: lash Date: Fri, 19 Jan 2018 00:38:09 +0100 Subject: [PATCH 3/3] cmd/swarm: Delint conversion --- cmd/swarm/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index b23d452869..c2209a3204 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -225,15 +225,15 @@ func cmdLineOverride(currentConfig *bzzapi.Config, ctx *cli.Context) *bzzapi.Con } if storeCapacity := ctx.GlobalUint64(SwarmStoreCapacity.Name); storeCapacity != 0 { - currentConfig.StoreParams.DbCapacity = uint64(storeCapacity) + currentConfig.StoreParams.DbCapacity = storeCapacity } if storeCacheCapacity := ctx.GlobalUint(SwarmStoreCacheCapacity.Name); storeCacheCapacity != 0 { - currentConfig.StoreParams.CacheCapacity = uint(storeCacheCapacity) + currentConfig.StoreParams.CacheCapacity = storeCacheCapacity } if storeRadius := ctx.GlobalInt(SwarmStoreRadius.Name); storeRadius != 0 { - currentConfig.StoreParams.Radius = int(storeRadius) + currentConfig.StoreParams.Radius = storeRadius } return currentConfig