From 0ee44e796a549c7864b0c78a9cec81ac27cb30eb Mon Sep 17 00:00:00 2001
From: Anton Evangelatov <anton.evangelatov@gmail.com>
Date: Fri, 28 Sep 2018 16:02:01 +0200
Subject: swarm/storage: make linter happy
---
swarm/storage/mru/lookup/epoch_test.go | 6 +++---
swarm/storage/mru/lookup/lookup_test.go | 4 +---
swarm/storage/mru/query.go | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
(limited to 'swarm')
diff --git a/swarm/storage/mru/lookup/epoch_test.go b/swarm/storage/mru/lookup/epoch_test.go
index 8c63ec6c2..62cf5523d 100644
--- a/swarm/storage/mru/lookup/epoch_test.go
+++ b/swarm/storage/mru/lookup/epoch_test.go
@@ -42,15 +42,15 @@ func TestAfter(t *testing.T) {
Level: 4,
}
- if b.After(a) != true {
+ if !b.After(a) {
t.Fatal("Expected 'after' to be true, got false")
}
- if b.After(b) != false {
+ if b.After(b) {
t.Fatal("Expected 'after' to be false when both epochs are identical, got true")
}
- if b.After(c) != true {
+ if !b.After(c) {
t.Fatal("Expected 'after' to be true when both epochs have the same time but the level is lower in the first one, but got false")
}
diff --git a/swarm/storage/mru/lookup/lookup_test.go b/swarm/storage/mru/lookup/lookup_test.go
index ca0bb73bb..34bcb61f0 100644
--- a/swarm/storage/mru/lookup/lookup_test.go
+++ b/swarm/storage/mru/lookup/lookup_test.go
@@ -38,9 +38,7 @@ func write(store Store, epoch lookup.Epoch, value *Data) {
}
func update(store Store, last lookup.Epoch, now uint64, value *Data) lookup.Epoch {
- var epoch lookup.Epoch
-
- epoch = lookup.GetNextEpoch(last, now)
+ epoch := lookup.GetNextEpoch(last, now)
write(store, epoch, value)
diff --git a/swarm/storage/mru/query.go b/swarm/storage/mru/query.go
index 9a0f261c4..13a28eaab 100644
--- a/swarm/storage/mru/query.go
+++ b/swarm/storage/mru/query.go
@@ -36,7 +36,7 @@ type Query struct {
// useful to parse query strings
func (q *Query) FromValues(values Values) error {
time, _ := strconv.ParseUint(values.Get("time"), 10, 64)
- q.TimeLimit = uint64(time)
+ q.TimeLimit = time
level, _ := strconv.ParseUint(values.Get("hint.level"), 10, 32)
q.Hint.Level = uint8(level)
--
cgit v1.2.3