mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
rebase on current develop branch 2016-07-09 swarm/services/ens: * Rework ENS functionality to use the current spec. * Refactor ens.go to set up sessions as needed * Refactoring to support independent registrar and personal resolver contracts * fixed tests swarm/examples/album: improve upload UX * No more unhandled errors and loose ends in the UI. * Forward/Back buttons work as undo/redo * all long operations display an informative modal dialog * minor problems with cursor movements fixed * reorder labels * throbber as default image * change browser history after delete or upload photo swarm/storage: * optimise splitter * simplify reader * benchmarks, tests improved * simplify IO, remove chunkreader.go and io.SectionReader clone * simplify error/timeout handling * port pyramid splitter by karalabe, adapt to Splitter/DPA interface, rework params etc * make NetStore.Put -> cloud.Store synchronous * chunker join fix process leak and keep parallelisation limited to depth 1 * reset the base hash to SHA3. !!hard fork = no backward compatibility :) * SectionReader -> LazySectionReader: Size method signature change * introduce abort channel to joiner to fix process leak * add abort channel context to all manifest retrieval methods * global waitgroup fixes intermittent upload test failures due to unfinished storage of chunks * streamline joiner logic, contexts now unique to each readAt call * LazyChunkReader seeker complains about missing size only if whence=2 * chunker join fix process leak and keep parallelisation limited to depth 1 swarm/network/kademlia: * simplify code * now really fix prox limit adjustment + tests and comments * simplify and make readable findclosest algo code + comments * reset initial time interval settings for kaddb findbest * fix bucket replace scheme to optimise stability and availability * absolute idle peers are disconnected after maxIdleInterval * fix index out of range when deleting last idle peer from kaddb * unwanted peers (due to full kad bucket) are now properly dropped with ErrUnwanted * improve logging and reorg in kademlia * simplify and fix code that deletes expired/unconnectable nodes * kaddb.findBest does not get stuck on empty row but finds an actual missing node * must replace node if bucket is full otherwise nodes will get stuck on empty rows * kademlia: timer fix * remove logging the state when syncing (resulting in deadlock) * improved logs, fix potential deadlock in String() * native go time marshalling * tests fixed swarm/network: * log node address consistently in syncdb * syncer logs queue cardinalities properly in syncUnSyncedKeys loop * fix hive stop issue leading to send on closed chan + minor logging fixes * better logging * hive interface change * fix process leak by adding select to state.synced <- false swarm/cmd: swarm control cli improvements * no more alias, swarm is executable so it can be called via ssh * environment vars now set to default, no need to preconfigure * local and remote hive monitoring * gethup.sh script now merged into swarm script and nice modularised * simplify bash code and fix e2e tests in swarm/test * stop method falls back to kill -9 after 10s * enode method now supplies ip addr via ipecho request * execute, options, rawoptions, setup, create-account addpeers and hive subcommands * update-src -> update * remote-update-scripts, remote-update-bin and remote-run * local and remote monitoring of kademlia * extensive documentation in swarm/cmd/README.md * add cleanlog, cleanbzz, update-src, remote-update-scripts, remote-update-bin, remote-run * for remote binary update, take scripts from swarm/cmd/swarm * raise default maxpeers to 40 * add latency loggingo to upload and download * add checkdownload and checkaccess subcommands * add mem/cpu/disk-info commands * include randomfile cmd from test * add enode, connect subcommands, improve startup (only one round needed) * TODO: simplify tests using new checks swarm/api/http: server handler: check protocol substring length to fix slice out of bounds crash swarm/api: * fix filesystem API - upload/Modify tests * simplify downloader code and fix process leak * change KAD defaults bucketsize 4, minproxbinsize 2 * add back final slash to paths in manifest matching * fix filesystem api tests
133 lines
3.5 KiB
Go
133 lines
3.5 KiB
Go
package storage
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
"sync"
|
|
"testing"
|
|
)
|
|
|
|
const testDataSize = 0x1000000
|
|
|
|
func TestDPArandom(t *testing.T) {
|
|
os.RemoveAll("/tmp/bzz")
|
|
dbStore, err := NewDbStore("/tmp/bzz", MakeHashFunc(defaultHash), defaultDbCapacity, defaultRadius)
|
|
dbStore.setCapacity(50000)
|
|
if err != nil {
|
|
t.Errorf("DB error: %v", err)
|
|
}
|
|
memStore := NewMemStore(dbStore, defaultCacheCapacity)
|
|
localStore := &LocalStore{
|
|
memStore,
|
|
dbStore,
|
|
}
|
|
chunker := NewTreeChunker(NewChunkerParams())
|
|
dpa := &DPA{
|
|
Chunker: chunker,
|
|
ChunkStore: localStore,
|
|
}
|
|
dpa.Start()
|
|
reader, slice := testDataReaderAndSlice(testDataSize)
|
|
wg := &sync.WaitGroup{}
|
|
key, err := dpa.Store(reader, testDataSize, wg)
|
|
if err != nil {
|
|
t.Errorf("Store error: %v", err)
|
|
}
|
|
wg.Wait()
|
|
resultReader := dpa.Retrieve(key)
|
|
resultSlice := make([]byte, len(slice))
|
|
n, err := resultReader.ReadAt(resultSlice, 0)
|
|
if err != io.EOF {
|
|
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.")
|
|
}
|
|
ioutil.WriteFile("/tmp/slice.bzz.16M", slice, 0666)
|
|
ioutil.WriteFile("/tmp/result.bzz.16M", resultSlice, 0666)
|
|
localStore.memStore = NewMemStore(dbStore, defaultCacheCapacity)
|
|
resultReader = dpa.Retrieve(key)
|
|
for i, _ := range resultSlice {
|
|
resultSlice[i] = 0
|
|
}
|
|
n, err = resultReader.ReadAt(resultSlice, 0)
|
|
if err != io.EOF {
|
|
t.Errorf("Retrieve error after removing memStore: %v", err)
|
|
}
|
|
if n != len(slice) {
|
|
t.Errorf("Slice size error after removing memStore got %d, expected %d.", n, len(slice))
|
|
}
|
|
if !bytes.Equal(slice, resultSlice) {
|
|
t.Errorf("Comparison error after removing memStore.")
|
|
}
|
|
}
|
|
|
|
func TestDPA_capacity(t *testing.T) {
|
|
os.RemoveAll("/tmp/bzz")
|
|
dbStore, err := NewDbStore("/tmp/bzz", MakeHashFunc(defaultHash), defaultDbCapacity, defaultRadius)
|
|
if err != nil {
|
|
t.Errorf("DB error: %v", err)
|
|
}
|
|
memStore := NewMemStore(dbStore, defaultCacheCapacity)
|
|
localStore := &LocalStore{
|
|
memStore,
|
|
dbStore,
|
|
}
|
|
memStore.setCapacity(0)
|
|
chunker := NewTreeChunker(NewChunkerParams())
|
|
dpa := &DPA{
|
|
Chunker: chunker,
|
|
ChunkStore: localStore,
|
|
}
|
|
dpa.Start()
|
|
reader, slice := testDataReaderAndSlice(testDataSize)
|
|
wg := &sync.WaitGroup{}
|
|
key, err := dpa.Store(reader, testDataSize, wg)
|
|
if err != nil {
|
|
t.Errorf("Store error: %v", err)
|
|
}
|
|
wg.Wait()
|
|
resultReader := dpa.Retrieve(key)
|
|
resultSlice := make([]byte, len(slice))
|
|
n, err := resultReader.ReadAt(resultSlice, 0)
|
|
if err != io.EOF {
|
|
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.")
|
|
}
|
|
// Clear memStore
|
|
memStore.setCapacity(0)
|
|
// check whether it is, indeed, empty
|
|
dpa.ChunkStore = memStore
|
|
resultReader = dpa.Retrieve(key)
|
|
n, err = resultReader.ReadAt(resultSlice, 0)
|
|
if err == nil {
|
|
t.Errorf("Was able to read %d bytes from an empty memStore.")
|
|
}
|
|
// check how it works with localStore
|
|
dpa.ChunkStore = localStore
|
|
// localStore.dbStore.setCapacity(0)
|
|
resultReader = dpa.Retrieve(key)
|
|
for i, _ := range resultSlice {
|
|
resultSlice[i] = 0
|
|
}
|
|
n, err = resultReader.ReadAt(resultSlice, 0)
|
|
if err != io.EOF {
|
|
t.Errorf("Retrieve error after clearing memStore: %v", err)
|
|
}
|
|
if n != len(slice) {
|
|
t.Errorf("Slice size error after clearing memStore got %d, expected %d.", n, len(slice))
|
|
}
|
|
if !bytes.Equal(slice, resultSlice) {
|
|
t.Errorf("Comparison error after clearing memStore.")
|
|
}
|
|
}
|