swarm/storage: simplify ChunkValidator interface (#18285)

This commit is contained in:
Javier Peletier
2018-12-12 16:22:17 +01:00
committed by Anton Evangelatov
parent ebbf3dfafb
commit 4e6f53ac33
7 changed files with 20 additions and 18 deletions

View File

@ -171,9 +171,11 @@ func (r *Request) toChunk() (storage.Chunk, error) {
}
// fromChunk populates this structure from chunk data. It does not verify the signature is valid.
func (r *Request) fromChunk(updateAddr storage.Address, chunkdata []byte) error {
func (r *Request) fromChunk(chunk storage.Chunk) error {
// for update chunk layout see Request definition
chunkdata := chunk.Data()
//deserialize the feed update portion
if err := r.Update.binaryGet(chunkdata[:len(chunkdata)-signatureLength]); err != nil {
return err
@ -189,7 +191,7 @@ func (r *Request) fromChunk(updateAddr storage.Address, chunkdata []byte) error
}
r.Signature = signature
r.idAddr = updateAddr
r.idAddr = chunk.Address()
r.binaryData = chunkdata
return nil