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

swarm/pss: Remove pss DPA + leaner cache

Browse source
This commit is contained in:
lash 2018-03-30 05:03:12 +02:00
parent 509a22e6cf
commit 48d957d616
2 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
swarm/pss/protocol_test.go
View file

@ -22,9 +22,9 @@ type protoCtrl struct {
// simple ping pong protocol test for the pss devp2p emulation // simple ping pong protocol test for the pss devp2p emulation
func TestProtocol(t *testing.T) { func TestProtocol(t *testing.T) {
t.Run("32", testProtocol) //t.Run("32", testProtocol)
t.Run("8", testProtocol) t.Run("8", testProtocol)
t.Run("0", testProtocol) //t.Run("0", testProtocol)
} }
func testProtocol(t *testing.T) { func testProtocol(t *testing.T) {

22
swarm/pss/pss.go
View file

@ -348,14 +348,6 @@ func (self *Pss) process(pssmsg *PssMsg) bool {
var keyid string var keyid string
var keyFunc func(envelope *whisper.Envelope) (*whisper.ReceivedMessage, string, *PssAddress, error) var keyFunc func(envelope *whisper.Envelope) (*whisper.ReceivedMessage, string, *PssAddress, error)
digest, err := self.digest(pssmsg)
if err != nil {
log.Warn(fmt.Sprintf("could not store message %v to cache: %v", pssmsg, err))
}
if self.checkFwdCache(nil, digest) {
log.Trace(fmt.Sprintf("pss relay block-cache match (process): FROM %x TO %x", self.Overlay.BaseAddr(), common.ToHex(pssmsg.To)))
return false
}
envelope := pssmsg.Payload envelope := pssmsg.Payload
psstopic := Topic(envelope.Topic) psstopic := Topic(envelope.Topic)
@ -694,12 +686,6 @@ func (self *Pss) forward(msg *PssMsg) {
to := make([]byte, addressLength) to := make([]byte, addressLength)
copy(to[:len(msg.To)], msg.To) copy(to[:len(msg.To)], msg.To)
// message hash
digest, err := self.digest(msg)
if err != nil {
log.Warn(fmt.Sprintf("could not store message %v to cache: %v", msg, err))
}
// send with kademlia // send with kademlia
// find the closest peer to the recipient and attempt to send // find the closest peer to the recipient and attempt to send
sent := 0 sent := 0
@ -835,11 +821,3 @@ func (self *Pss) isMsgExpired(msg *PssMsg) bool {
} }
return false return false
} }
func (self *Pss) isMsgExpired(msg *PssMsg) bool {
msgexp := time.Unix(int64(msg.Expire), 0)
if msgexp.Before(time.Now()) || msgexp.After(time.Now().Add(self.msgTTL)) {
return true
}
return false
}