forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 01:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #202 from ethersphere/swarm-network-rewrite-green

Browse source 
swarm/storage/mock: Omit test on <1.8
This commit is contained in:
lash 2018-01-19 15:01:40 +01:00 committed by GitHub
commit c7ce92fe46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/swarm/config.go
View file

@ -225,15 +225,15 @@ func cmdLineOverride(currentConfig *bzzapi.Config, ctx *cli.Context) *bzzapi.Con
} }
if storeCapacity := ctx.GlobalUint64(SwarmStoreCapacity.Name); storeCapacity != 0 { 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 { 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 { if storeRadius := ctx.GlobalInt(SwarmStoreRadius.Name); storeRadius != 0 {
currentConfig.StoreParams.Radius = int(storeRadius) currentConfig.StoreParams.Radius = storeRadius
} }
return currentConfig return currentConfig

2
swarm/storage/mock/db/db_test.go
View file

@ -1,3 +1,5 @@
// +build go1.8
//
// Copyright 2018 The go-ethereum Authors // Copyright 2018 The go-ethereum Authors
// This file is part of the go-ethereum library. // This file is part of the go-ethereum library.
// //