diff options
| author | Viktor Trón <viktor.tron@gmail.com> | 2018-07-24 14:44:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 14:44:43 +0800 |
| commit | b536460f8e4166e1a884fd30290b56a85289503f (patch) | |
| tree | 4630a130bad7ec02412a6df673313d2fbac71893 /swarm/swarm.go | |
| parent | afd8b847060eed094cd7c6e0d133338a33cf4631 (diff) | |
| parent | 14bdcdeab448885d22e516933f59096311c19672 (diff) | |
| download | dexon-b536460f8e4166e1a884fd30290b56a85289503f.tar dexon-b536460f8e4166e1a884fd30290b56a85289503f.tar.gz dexon-b536460f8e4166e1a884fd30290b56a85289503f.tar.bz2 dexon-b536460f8e4166e1a884fd30290b56a85289503f.tar.lz dexon-b536460f8e4166e1a884fd30290b56a85289503f.tar.xz dexon-b536460f8e4166e1a884fd30290b56a85289503f.tar.zst dexon-b536460f8e4166e1a884fd30290b56a85289503f.zip | |
Merge pull request #17231 from ethersphere/develop
swarm: client-side MRU signatures ; BMT fixes ; network simulation tests
Diffstat (limited to 'swarm/swarm.go')
| -rw-r--r-- | swarm/swarm.go | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/swarm/swarm.go b/swarm/swarm.go index bf8bcdbd5..db7d2dfed 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -192,25 +192,8 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e self.fileStore = storage.NewFileStore(netStore, self.config.FileStoreParams) var resourceHandler *mru.Handler - rhparams := &mru.HandlerParams{ - // TODO: config parameter to set limits - QueryMaxPeriods: &mru.LookupParams{ - Limit: false, - }, - Signer: &mru.GenericSigner{ - PrivKey: self.privateKey, - }, - } - if resolver != nil { - resolver.SetNameHash(ens.EnsNode) - // Set HeaderGetter and OwnerValidator interfaces to resolver only if it is not nil. - rhparams.HeaderGetter = resolver - rhparams.OwnerValidator = resolver - } else { - log.Warn("No ETH API specified, resource updates will use block height approximation") - // TODO: blockestimator should use saved values derived from last time ethclient was connected - rhparams.HeaderGetter = mru.NewBlockEstimator() - } + rhparams := &mru.HandlerParams{} + resourceHandler, err = mru.NewHandler(rhparams) if err != nil { return nil, err |