From 3f328c20b2f11658df4d1797b81d498dfa27e38f Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Fri, 6 Feb 2015 19:54:27 +0100
Subject: [PATCH] minor change in dpa and dpa test (fails)

---
 bzz/dpa.go      |  12 +++---
 bzz/dpa_test.go | 102 ++++++++++++++++++++++++------------------------
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/bzz/dpa.go b/bzz/dpa.go
index aa055645d4..496919a4f6 100644
--- a/bzz/dpa.go
+++ b/bzz/dpa.go
@@ -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:
 			}
 		}
 	}()
diff --git a/bzz/dpa_test.go b/bzz/dpa_test.go
index 73f34782ac..10cfd0773a 100644
--- a/bzz/dpa_test.go
+++ b/bzz/dpa_test.go
@@ -1,51 +1,51 @@
-package bzz
-
-import (
-	//"bytes"
-	"fmt"
-	"github.com/ethereum/go-ethereum/bzz/test"
-	"os"
-	"testing"
-	"time"
-)
-
-func TestDPA(t *testing.T) {
-	test.LogInit()
-	os.RemoveAll("/tmp/bzz")
-	dbStore, err := newDbStore("/tmp/bzz")
-	if err != nil {
-		t.Errorf("DB error: %v", err)
-	}
-	//	memStore := newMemStore(dbStore)
-	//	localStore := &localStore{
-	//		memStore,
-	//		dbStore,
-	//	}
-	chunker := &TreeChunker{}
-	chunker.Init()
-	dpa := &DPA{
-		Chunker:    chunker,
-		ChunkStore: dbStore,
-	}
-	dpa.Start()
-	reader, slice := testDataReader(0x100)
-	fmt.Printf("Chunk size: %d.", len(slice))
-	//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.")
-	//	}
-	time.Sleep(time.Second)
-}
+package bzz
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/ethereum/go-ethereum/bzz/test"
+	"os"
+	"testing"
+	"time"
+)
+
+func TestDPA(t *testing.T) {
+	test.LogInit()
+	os.RemoveAll("/tmp/bzz")
+	dbStore, err := newDbStore("/tmp/bzz")
+	if err != nil {
+		t.Errorf("DB error: %v", err)
+	}
+	//	memStore := newMemStore(dbStore)
+	//	localStore := &localStore{
+	//		memStore,
+	//		dbStore,
+	//	}
+	chunker := &TreeChunker{}
+	chunker.Init()
+	dpa := &DPA{
+		Chunker:    chunker,
+		ChunkStore: dbStore,
+	}
+	dpa.Start()
+	reader, slice := testDataReader(0x100)
+	fmt.Printf("Chunk size: %d.", len(slice))
+	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.")
+	}
+	time.Sleep(time.Second)
+}