1 files changed, 22 insertions, 24 deletions

diff --git a/swarm/storage/mru/resource_test.go b/swarm/storage/mru/resource_test.go
index 76d7c58a1..0fb465bb0 100644
--- a/swarm/storage/mru/resource_test.go
+++ b/swarm/storage/mru/resource_test.go
@@ -87,8 +87,7 @@ func TestUpdateChunkSerializationErrorChecking(t *testing.T) {
 		resourceUpdate: resourceUpdate{
 			updateHeader: updateHeader{
 				UpdateLookup: UpdateLookup{
-
-					rootAddr: make([]byte, 79), // put the wrong length, should be storage.KeyLength
+					rootAddr: make([]byte, 79), // put the wrong length, should be storage.AddressLength
 				},
 				metaHash:  nil,
 				multihash: false,
@@ -99,8 +98,8 @@ func TestUpdateChunkSerializationErrorChecking(t *testing.T) {
 	if err == nil {
 		t.Fatal("Expected newUpdateChunk to fail when rootAddr or metaHash have the wrong length")
 	}
-	r.rootAddr = make([]byte, storage.KeyLength)
-	r.metaHash = make([]byte, storage.KeyLength)
+	r.rootAddr = make([]byte, storage.AddressLength)
+	r.metaHash = make([]byte, storage.AddressLength)
 	_, err = r.toChunk()
 	if err == nil {
 		t.Fatal("Expected newUpdateChunk to fail when there is no data")
@@ -197,7 +196,7 @@ func TestReverse(t *testing.T) {
 
 	// check that we can recover the owner account from the update chunk's signature
 	var checkUpdate SignedResourceUpdate
-	if err := checkUpdate.fromChunk(chunk.Addr, chunk.SData); err != nil {
+	if err := checkUpdate.fromChunk(chunk.Address(), chunk.Data()); err != nil {
 		t.Fatal(err)
 	}
 	checkdigest, err := checkUpdate.GetDigest()
@@ -215,8 +214,8 @@ func TestReverse(t *testing.T) {
 		t.Fatalf("addresses dont match: %x != %x", originaladdress, recoveredaddress)
 	}
 
-	if !bytes.Equal(key[:], chunk.Addr[:]) {
-		t.Fatalf("Expected chunk key '%x', was '%x'", key, chunk.Addr)
+	if !bytes.Equal(key[:], chunk.Address()[:]) {
+		t.Fatalf("Expected chunk key '%x', was '%x'", key, chunk.Address())
 	}
 	if period != checkUpdate.period {
 		t.Fatalf("Expected period '%d', was '%d'", period, checkUpdate.period)
@@ -270,16 +269,16 @@ func TestResourceHandler(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	chunk, err := rh.chunkStore.Get(context.TODO(), storage.Address(request.rootAddr))
+	chunk, err := rh.chunkStore.Get(ctx, storage.Address(request.rootAddr))
 	if err != nil {
 		t.Fatal(err)
-	} else if len(chunk.SData) < 16 {
-		t.Fatalf("chunk data must be minimum 16 bytes, is %d", len(chunk.SData))
+	} else if len(chunk.Data()) < 16 {
+		t.Fatalf("chunk data must be minimum 16 bytes, is %d", len(chunk.Data()))
 	}
 
 	var recoveredMetadata ResourceMetadata
 
-	recoveredMetadata.binaryGet(chunk.SData)
+	recoveredMetadata.binaryGet(chunk.Data())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -704,7 +703,7 @@ func TestValidator(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !rh.Validate(chunk.Addr, chunk.SData) {
+	if !rh.Validate(chunk.Address(), chunk.Data()) {
 		t.Fatal("Chunk validator fail on update chunk")
 	}
 
@@ -724,7 +723,7 @@ func TestValidator(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if rh.Validate(chunk.Addr, chunk.SData) {
+	if rh.Validate(chunk.Address(), chunk.Data()) {
 		t.Fatal("Chunk validator did not fail on update chunk with false address")
 	}
 
@@ -742,7 +741,7 @@ func TestValidator(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if !rh.Validate(chunk.Addr, chunk.SData) {
+	if !rh.Validate(chunk.Address(), chunk.Data()) {
 		t.Fatal("Chunk validator fail on metadata chunk")
 	}
 }
@@ -783,8 +782,7 @@ func TestValidatorInStore(t *testing.T) {
 	// create content addressed chunks, one good, one faulty
 	chunks := storage.GenerateRandomChunks(chunk.DefaultSize, 2)
 	goodChunk := chunks[0]
-	badChunk := chunks[1]
-	badChunk.SData = goodChunk.SData
+	badChunk := storage.NewChunk(chunks[1].Address(), goodChunk.Data())
 
 	metadata := &ResourceMetadata{
 		StartTime: startTime,
@@ -801,7 +799,7 @@ func TestValidatorInStore(t *testing.T) {
 	updateLookup := UpdateLookup{
 		period:   42,
 		version:  1,
-		rootAddr: rootChunk.Addr,
+		rootAddr: rootChunk.Address(),
 	}
 
 	updateAddr := updateLookup.UpdateAddr()
@@ -826,16 +824,16 @@ func TestValidatorInStore(t *testing.T) {
 	}
 
 	// put the chunks in the store and check their error status
-	storage.PutChunks(store, goodChunk)
-	if goodChunk.GetErrored() == nil {
+	err = store.Put(context.Background(), goodChunk)
+	if err == nil {
 		t.Fatal("expected error on good content address chunk with resource validator only, but got nil")
 	}
-	storage.PutChunks(store, badChunk)
-	if badChunk.GetErrored() == nil {
+	err = store.Put(context.Background(), badChunk)
+	if err == nil {
 		t.Fatal("expected error on bad content address chunk with resource validator only, but got nil")
 	}
-	storage.PutChunks(store, uglyChunk)
-	if err := uglyChunk.GetErrored(); err != nil {
+	err = store.Put(context.Background(), uglyChunk)
+	if err != nil {
 		t.Fatalf("expected no error on resource update chunk with resource validator only, but got: %s", err)
 	}
 }
@@ -897,7 +895,7 @@ func getUpdateDirect(rh *Handler, addr storage.Address) ([]byte, error) {
 		return nil, err
 	}
 	var r SignedResourceUpdate
-	if err := r.fromChunk(addr, chunk.SData); err != nil {
+	if err := r.fromChunk(addr, chunk.Data()); err != nil {
 		return nil, err
 	}
 	return r.data, nil