minor change in dpa and dpa test (fails)

This commit is contained in:
zelig 2015-02-06 19:54:27 +01:00
parent effe37d282
commit 3f328c20b2
2 changed files with 57 additions and 57 deletions

View file

@ -175,15 +175,15 @@ func (self *DPA) storeLoop() {
fmt.Printf("StoreLoop started.\n")
STORE:
for {
chunk := <-self.storeC
fmt.Printf("StoreLoop reader size %d\n", chunk.Reader.Size())
chunk.Data = make([]byte, chunk.Reader.Size())
chunk.Reader.ReadAt(chunk.Data, 0)
self.ChunkStore.Put(chunk)
select {
case chunk := <-self.storeC:
fmt.Printf("StoreLoop reader size %d\n", chunk.Reader.Size())
chunk.Data = make([]byte, chunk.Reader.Size())
chunk.Reader.ReadAt(chunk.Data, 0)
self.ChunkStore.Put(chunk)
case <-self.quitC:
break STORE
default:
// default:
}
}
}()

View file

@ -1,7 +1,7 @@
package bzz
import (
//"bytes"
"bytes"
"fmt"
"github.com/ethereum/go-ethereum/bzz/test"
"os"
@ -30,22 +30,22 @@ func TestDPA(t *testing.T) {
dpa.Start()
reader, slice := testDataReader(0x100)
fmt.Printf("Chunk size: %d.", len(slice))
//key, err := dpa.Store(reader)
_, err = dpa.Store(reader)
key, err := dpa.Store(reader)
// _, err = dpa.Store(reader)
if err != nil {
t.Errorf("Store error: %v", err)
}
// resultReader := dpa.Retrieve(key)
// resultSlice := make([]byte, len(slice))
// n, err := resultReader.Read(resultSlice)
// if err != nil {
// t.Errorf("Retrieve error: %v", err)
// }
// if n != len(slice) {
// t.Errorf("Slice size error got %d, expected %d.", n, len(slice))
// }
// if !bytes.Equal(slice, resultSlice) {
// t.Errorf("Comparison error.")
// }
resultReader := dpa.Retrieve(key)
resultSlice := make([]byte, len(slice))
n, err := resultReader.Read(resultSlice)
if err != nil {
t.Errorf("Retrieve error: %v", err)
}
if n != len(slice) {
t.Errorf("Slice size error got %d, expected %d.", n, len(slice))
}
if !bytes.Equal(slice, resultSlice) {
t.Errorf("Comparison error.")
}
time.Sleep(time.Second)
}