cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

swarm/storage: remove unused methods from Chunk interface (#18283)

Browse Source
This commit is contained in:
Javier Peletier 2018-12-18 15:25:02 +01:00 committed by Anton Evangelatov
parent b01cfce362
commit fe86a707d8
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swarm/storage/common_test.go
View File

@ -179,8 +179,9 @@ func testStoreCorrect(m ChunkStore, n int, chunksize int64, t *testing.T) {
return fmt.Errorf("key does not match retrieved chunk Address") return fmt.Errorf("key does not match retrieved chunk Address")
} }
hasher := MakeHashFunc(DefaultHash)() hasher := MakeHashFunc(DefaultHash)()
hasher.ResetWithLength(chunk.SpanBytes()) data := chunk.Data()
hasher.Write(chunk.Payload()) hasher.ResetWithLength(data[:8])
hasher.Write(data[8:])
exp := hasher.Sum(nil) exp := hasher.Sum(nil)
if !bytes.Equal(h, exp) { if !bytes.Equal(h, exp) {
return fmt.Errorf("key is not hash of chunk data") return fmt.Errorf("key is not hash of chunk data")

2
swarm/storage/memstore.go
View File

@ -57,7 +57,7 @@ func (m *MemStore) Get(_ context.Context, addr Address) (Chunk, error) {
if !ok { if !ok {
return nil, ErrChunkNotFound return nil, ErrChunkNotFound
} }
return c.(*chunk), nil return c.(Chunk), nil
} }
func (m *MemStore) Put(_ context.Context, c Chunk) error { func (m *MemStore) Put(_ context.Context, c Chunk) error {

18
swarm/storage/types.go
View File

@ -184,9 +184,6 @@ func (c AddressCollection) Swap(i, j int) {
// Chunk interface implemented by context.Contexts and data chunks // Chunk interface implemented by context.Contexts and data chunks
type Chunk interface { type Chunk interface {
Address() Address Address() Address
Payload() []byte
SpanBytes() []byte
Span() int64
Data() []byte Data() []byte
} }
@ -208,25 +205,10 @@ func (c *chunk) Address() Address {
return c.addr return c.addr
} }
func (c *chunk) SpanBytes() []byte {
return c.sdata[:8]
}
func (c *chunk) Span() int64 {
if c.span == -1 {
c.span = int64(binary.LittleEndian.Uint64(c.sdata[:8]))
}
return c.span
}
func (c *chunk) Data() []byte { func (c *chunk) Data() []byte {
return c.sdata return c.sdata
} }
func (c *chunk) Payload() []byte {
return c.sdata[8:]
}
// String() for pretty printing // String() for pretty printing
func (self *chunk) String() string { func (self *chunk) String() string {
return fmt.Sprintf("Address: %v TreeSize: %v Chunksize: %v", self.addr.Log(), self.span, len(self.sdata)) return fmt.Sprintf("Address: %v TreeSize: %v Chunksize: %v", self.addr.Log(), self.span, len(self.sdata))