diff options
| author | Viktor Trón <viktor.tron@gmail.com> | 2018-10-03 20:59:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 20:59:41 +0800 |
| commit | e5677114dc7461fe39ebe353a4657aa4cb03fde4 (patch) | |
| tree | 8605f9a8b726b158fd01b4befced1e3ba92ca1f9 /swarm/swarm.go | |
| parent | 303b99663e963a520aaa44eca68e042d9fe230af (diff) | |
| parent | de01178c18766b9f744acc94fe2b96804f998e40 (diff) | |
| download | dexon-e5677114dc7461fe39ebe353a4657aa4cb03fde4.tar dexon-e5677114dc7461fe39ebe353a4657aa4cb03fde4.tar.gz dexon-e5677114dc7461fe39ebe353a4657aa4cb03fde4.tar.bz2 dexon-e5677114dc7461fe39ebe353a4657aa4cb03fde4.tar.lz dexon-e5677114dc7461fe39ebe353a4657aa4cb03fde4.tar.xz dexon-e5677114dc7461fe39ebe353a4657aa4cb03fde4.tar.zst dexon-e5677114dc7461fe39ebe353a4657aa4cb03fde4.zip | |
Merge pull request #17796 from epiclabs-io/mru-feeds
swarm/storage/feeds: Renamed MRU to Swarm Feeds
Diffstat (limited to 'swarm/swarm.go')
| -rw-r--r-- | swarm/swarm.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/swarm/swarm.go b/swarm/swarm.go index 5b6938754..aea0989a1 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -49,8 +49,8 @@ import ( "github.com/ethereum/go-ethereum/swarm/pss" "github.com/ethereum/go-ethereum/swarm/state" "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethereum/go-ethereum/swarm/storage/feed" "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/storage/mru" "github.com/ethereum/go-ethereum/swarm/tracing" ) @@ -186,15 +186,15 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e // Swarm Hash Merklised Chunking for Arbitrary-length Document/File storage self.fileStore = storage.NewFileStore(self.netStore, self.config.FileStoreParams) - var resourceHandler *mru.Handler - rhparams := &mru.HandlerParams{} + var feedsHandler *feed.Handler + fhParams := &feed.HandlerParams{} - resourceHandler = mru.NewHandler(rhparams) - resourceHandler.SetStore(self.netStore) + feedsHandler = feed.NewHandler(fhParams) + feedsHandler.SetStore(self.netStore) lstore.Validators = []storage.ChunkValidator{ storage.NewContentAddressValidator(storage.MakeHashFunc(storage.DefaultHash)), - resourceHandler, + feedsHandler, } err = lstore.Migrate() @@ -215,7 +215,7 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e pss.SetHandshakeController(self.ps, pss.NewHandshakeParams()) } - self.api = api.NewAPI(self.fileStore, self.dns, resourceHandler, self.privateKey) + self.api = api.NewAPI(self.fileStore, self.dns, feedsHandler, self.privateKey) self.sfs = fuse.NewSwarmFS(self.api) log.Debug("Initialized FUSE filesystem") |