diff options
| author | Anton Evangelatov <anton.evangelatov@gmail.com> | 2018-08-14 22:03:56 +0800 |
|---|---|---|
| committer | Balint Gabor <balint.g@gmail.com> | 2018-08-14 22:03:56 +0800 |
| commit | 97887d98da703a31040bceee13bce9ee77fca673 (patch) | |
| tree | ffc9a8a6fba087b26d33c0ef6c939a19aaaad8c9 /swarm/swarm.go | |
| parent | 8a040de60bd6b740ebe87cd8e1fe6bfdb6635d2f (diff) | |
| download | go-tangerine-97887d98da703a31040bceee13bce9ee77fca673.tar go-tangerine-97887d98da703a31040bceee13bce9ee77fca673.tar.gz go-tangerine-97887d98da703a31040bceee13bce9ee77fca673.tar.bz2 go-tangerine-97887d98da703a31040bceee13bce9ee77fca673.tar.lz go-tangerine-97887d98da703a31040bceee13bce9ee77fca673.tar.xz go-tangerine-97887d98da703a31040bceee13bce9ee77fca673.tar.zst go-tangerine-97887d98da703a31040bceee13bce9ee77fca673.zip | |
swarm/network, swarm/storage: validate chunk size (#17397)
* swarm/network, swarm/storage: validate default chunk size
* swarm/bmt, swarm/network, swarm/storage: update BMT hash initialisation
* swarm/bmt: move segmentCount to tests
* swarm/chunk: change chunk.DefaultSize to be untyped const
* swarm/storage: add size validator
* swarm/storage: add chunk size validation to localstore
* swarm/storage: move validation from localstore to validator
* swarm/storage: global chunk rules in MRU
Diffstat (limited to 'swarm/swarm.go')
| -rw-r--r-- | swarm/swarm.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/swarm/swarm.go b/swarm/swarm.go index c380a376f..f731ff33d 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -195,18 +195,13 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e var resourceHandler *mru.Handler rhparams := &mru.HandlerParams{} - resourceHandler, err = mru.NewHandler(rhparams) - if err != nil { - return nil, err - } + resourceHandler = mru.NewHandler(rhparams) resourceHandler.SetStore(netStore) - var validators []storage.ChunkValidator - validators = append(validators, storage.NewContentAddressValidator(storage.MakeHashFunc(storage.DefaultHash))) - if resourceHandler != nil { - validators = append(validators, resourceHandler) + self.lstore.Validators = []storage.ChunkValidator{ + storage.NewContentAddressValidator(storage.MakeHashFunc(storage.DefaultHash)), + resourceHandler, } - self.lstore.Validators = validators // setup local store log.Debug(fmt.Sprintf("Set up local storage")) |