aboutsummaryrefslogtreecommitdiffstats
path: root/swarm
diff options
context:
space:
mode:
Diffstat (limited to 'swarm')
-rw-r--r--swarm/api/manifest.go6
-rw-r--r--swarm/fuse/fuse_file.go11
-rw-r--r--swarm/network/depo.go2
-rw-r--r--swarm/network/kademlia/address.go2
-rw-r--r--swarm/network/kademlia/kaddb.go6
-rw-r--r--swarm/network/protocol.go2
-rw-r--r--swarm/network/syncer.go2
-rw-r--r--swarm/storage/chunker.go4
-rw-r--r--swarm/storage/memstore.go2
-rw-r--r--swarm/storage/pyramid.go4
10 files changed, 21 insertions, 20 deletions
diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go
index d3eced198..32b5f80a7 100644
--- a/swarm/api/manifest.go
+++ b/swarm/api/manifest.go
@@ -238,7 +238,7 @@ func (self *manifestTrie) addEntry(entry *manifestTrieEntry, quitC chan bool) {
return
}
- b := byte(entry.Path[0])
+ b := entry.Path[0]
oldentry := self.entries[b]
if (oldentry == nil) || (oldentry.Path == entry.Path && oldentry.ContentType != ManifestType) {
self.entries[b] = entry
@@ -294,7 +294,7 @@ func (self *manifestTrie) deleteEntry(path string, quitC chan bool) {
return
}
- b := byte(path[0])
+ b := path[0]
entry := self.entries[b]
if entry == nil {
return
@@ -425,7 +425,7 @@ func (self *manifestTrie) findPrefixOf(path string, quitC chan bool) (entry *man
}
//see if first char is in manifest entries
- b := byte(path[0])
+ b := path[0]
entry = self.entries[b]
if entry == nil {
return self.entries[256], 0
diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go
index 32c85d02f..c94a0773f 100644
--- a/swarm/fuse/fuse_file.go
+++ b/swarm/fuse/fuse_file.go
@@ -19,15 +19,16 @@
package fuse
import (
+ "errors"
+ "io"
+ "os"
+ "sync"
+
"bazil.org/fuse"
"bazil.org/fuse/fs"
- "errors"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/swarm/storage"
"golang.org/x/net/context"
- "io"
- "os"
- "sync"
)
const (
@@ -87,7 +88,7 @@ func (file *SwarmFile) Attr(ctx context.Context, a *fuse.Attr) error {
if err != nil {
log.Warn("Couldnt get size of file %s : %v", file.path, err)
}
- file.fileSize = int64(size)
+ file.fileSize = size
}
a.Size = uint64(file.fileSize)
return nil
diff --git a/swarm/network/depo.go b/swarm/network/depo.go
index 8695bf5d9..17540d2f9 100644
--- a/swarm/network/depo.go
+++ b/swarm/network/depo.go
@@ -55,7 +55,7 @@ func (self *Depo) HandleUnsyncedKeysMsg(req *unsyncedKeysMsgData, p *peer) error
var err error
for _, req := range unsynced {
// skip keys that are found,
- chunk, err = self.localStore.Get(storage.Key(req.Key[:]))
+ chunk, err = self.localStore.Get(req.Key[:])
if err != nil || chunk.SData == nil {
missing = append(missing, req)
}
diff --git a/swarm/network/kademlia/address.go b/swarm/network/kademlia/address.go
index 16c5ce532..4c38a846f 100644
--- a/swarm/network/kademlia/address.go
+++ b/swarm/network/kademlia/address.go
@@ -67,7 +67,7 @@ func proximity(one, other Address) (ret int) {
for i := 0; i < len(one); i++ {
oxo := one[i] ^ other[i]
for j := 0; j < 8; j++ {
- if (uint8(oxo)>>uint8(7-j))&0x01 != 0 {
+ if (oxo>>uint8(7-j))&0x01 != 0 {
return i*8 + j
}
}
diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go
index 3e4b261fd..cb0869467 100644
--- a/swarm/network/kademlia/kaddb.go
+++ b/swarm/network/kademlia/kaddb.go
@@ -211,12 +211,12 @@ func (self *KadDb) findBest(maxBinSize int, binSize func(int) int) (node *NodeRe
}
// if node is scheduled to connect
- if time.Time(node.After).After(time.Now()) {
+ if node.After.After(time.Now()) {
log.Debug(fmt.Sprintf("kaddb record %v (PO%03d:%d) skipped. seen at %v (%v ago), scheduled at %v", node.Addr, po, cursor, node.Seen, delta, node.After))
continue ROW
}
- delta = time.Since(time.Time(node.Seen))
+ delta = time.Since(node.Seen)
if delta < self.initialRetryInterval {
delta = self.initialRetryInterval
}
@@ -230,7 +230,7 @@ func (self *KadDb) findBest(maxBinSize int, binSize func(int) int) (node *NodeRe
log.Debug(fmt.Sprintf("kaddb record %v (PO%03d:%d) ready to be tried. seen at %v (%v ago), scheduled at %v", node.Addr, po, cursor, node.Seen, delta, node.After))
// scheduling next check
- interval = time.Duration(delta * time.Duration(self.connRetryExp))
+ interval = delta * time.Duration(self.connRetryExp)
after = time.Now().Add(interval)
log.Debug(fmt.Sprintf("kaddb record %v (PO%03d:%d) selected as candidate connection %v. seen at %v (%v ago), selectable since %v, retry after %v (in %v)", node.Addr, po, cursor, rounds, node.Seen, delta, node.After, after, interval))
diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go
index 2f880df57..a418c1dbb 100644
--- a/swarm/network/protocol.go
+++ b/swarm/network/protocol.go
@@ -309,7 +309,7 @@ func (self *bzz) handleStatus() (err error) {
Version: uint64(Version),
ID: "honey",
Addr: self.selfAddr(),
- NetworkId: uint64(self.NetworkId),
+ NetworkId: self.NetworkId,
Swap: &bzzswap.SwapProfile{
Profile: self.swapParams.Profile,
PayProfile: self.swapParams.PayProfile,
diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go
index a3814e423..d76af022c 100644
--- a/swarm/network/syncer.go
+++ b/swarm/network/syncer.go
@@ -378,7 +378,7 @@ func (self *syncer) syncHistory(state *syncState) chan interface{} {
}
select {
// blocking until history channel is read from
- case history <- storage.Key(key):
+ case history <- key:
n++
log.Trace(fmt.Sprintf("syncer[%v]: history: %v (%v keys)", self.key.Log(), key.Log(), n))
state.Latest = key
diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go
index 8c0d62cbe..98cd6e75e 100644
--- a/swarm/storage/chunker.go
+++ b/swarm/storage/chunker.go
@@ -205,9 +205,9 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data io.Reade
}
// dept > 0
// intermediate chunk containing child nodes hashes
- branchCnt := int64((size + treeSize - 1) / treeSize)
+ branchCnt := (size + treeSize - 1) / treeSize
- var chunk []byte = make([]byte, branchCnt*self.hashSize+8)
+ var chunk = make([]byte, branchCnt*self.hashSize+8)
var pos, i int64
binary.LittleEndian.PutUint64(chunk[0:8], uint64(size))
diff --git a/swarm/storage/memstore.go b/swarm/storage/memstore.go
index 155dd0088..3cb25ac62 100644
--- a/swarm/storage/memstore.go
+++ b/swarm/storage/memstore.go
@@ -78,7 +78,7 @@ type memTree struct {
func newMemTree(b uint, parent *memTree, pidx uint) (node *memTree) {
node = new(memTree)
node.bits = b
- node.width = 1 << uint(b)
+ node.width = 1 << b
node.subtree = make([]*memTree, node.width)
node.access = make([]uint64, node.width-1)
node.parent = parent
diff --git a/swarm/storage/pyramid.go b/swarm/storage/pyramid.go
index 42b83583d..5de385dcb 100644
--- a/swarm/storage/pyramid.go
+++ b/swarm/storage/pyramid.go
@@ -327,7 +327,7 @@ func (self *PyramidChunker) loadTree(chunkLevel [][]*TreeEntry, key Key, chunkC
// Add the root chunk entry
branchCount := int64(len(chunk.SData)-8) / self.hashSize
newEntry := &TreeEntry{
- level: int(depth - 1),
+ level: depth - 1,
branchCount: branchCount,
subtreeSize: uint64(chunk.Size),
chunk: chunk.SData,
@@ -352,7 +352,7 @@ func (self *PyramidChunker) loadTree(chunkLevel [][]*TreeEntry, key Key, chunkC
}
bewBranchCount := int64(len(newChunk.SData)-8) / self.hashSize
newEntry := &TreeEntry{
- level: int(lvl - 1),
+ level: lvl - 1,
branchCount: bewBranchCount,
subtreeSize: uint64(newChunk.Size),
chunk: newChunk.SData,
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 04:13:28 +0800