forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/network: No need to store dbAccess on StreamerPeer

Browse source
This commit is contained in:
Balint Gabor 2018-01-12 20:09:27 +01:00
parent 1d7d6c9049
commit bab67a45be
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
swarm/network/streamer.go
View file

@ -138,7 +138,7 @@ type Streamer struct {
// NewStreamer is Streamer constructor // NewStreamer is Streamer constructor
func NewStreamer(overlay Overlay, dbAccess *DbAccess) *Streamer { func NewStreamer(overlay Overlay, dbAccess *DbAccess) *Streamer {
return &Streamer{ streamer := &Streamer{
outgoing: make(map[string]func(*StreamerPeer, []byte) (OutgoingStreamer, error)), outgoing: make(map[string]func(*StreamerPeer, []byte) (OutgoingStreamer, error)),
incoming: make(map[string]func(*StreamerPeer, []byte) (IncomingStreamer, error)), incoming: make(map[string]func(*StreamerPeer, []byte) (IncomingStreamer, error)),
dbAccess: dbAccess, dbAccess: dbAccess,
@ -233,7 +233,6 @@ type StreamerPeer struct {
streamer *Streamer streamer *Streamer
pq *pq.PriorityQueue pq *pq.PriorityQueue
//netStore storage.ChunkStore //netStore storage.ChunkStore
dbAccess *DbAccess
outgoingLock sync.RWMutex outgoingLock sync.RWMutex
incomingLock sync.RWMutex incomingLock sync.RWMutex
outgoing map[string]*outgoingStreamer outgoing map[string]*outgoingStreamer
@ -266,7 +265,7 @@ type RetrieveRequestMsg struct {
} }
func (self *StreamerPeer) handleRetrieveRequestMsg(req *RetrieveRequestMsg) error { func (self *StreamerPeer) handleRetrieveRequestMsg(req *RetrieveRequestMsg) error {
chunk, created := self.dbAccess.getOrCreateRequest(req.Key) chunk, created := self.streamer.dbAccess.getOrCreateRequest(req.Key)
s, err := self.getOutgoingStreamer(retrieveRequestStream) s, err := self.getOutgoingStreamer(retrieveRequestStream)
if err != nil { if err != nil {
return err return err
@ -337,7 +336,7 @@ func (self *Streamer) deletePeer(peer *StreamerPeer) {
} }
func (self *StreamerPeer) handleChunkDeliveryMsg(req *ChunkDeliveryMsg) error { func (self *StreamerPeer) handleChunkDeliveryMsg(req *ChunkDeliveryMsg) error {
chunk, err := self.dbAccess.get(req.Key) chunk, err := self.streamer.dbAccess.get(req.Key)
if err != nil { if err != nil {
return err return err
} }