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") fmt.Printf("StoreLoop started.\n")
STORE: STORE:
for { for {
chunk := <-self.storeC select {
case chunk := <-self.storeC:
fmt.Printf("StoreLoop reader size %d\n", chunk.Reader.Size()) fmt.Printf("StoreLoop reader size %d\n", chunk.Reader.Size())
chunk.Data = make([]byte, chunk.Reader.Size()) chunk.Data = make([]byte, chunk.Reader.Size())
chunk.Reader.ReadAt(chunk.Data, 0) chunk.Reader.ReadAt(chunk.Data, 0)
self.ChunkStore.Put(chunk) self.ChunkStore.Put(chunk)
select {
case <-self.quitC: case <-self.quitC:
break STORE break STORE
default: // default:
} }
} }
}() }()

View file

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