gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rpc, whisper, xeth: polish whisper RPC interface

Browse Source
This commit is contained in:
Péter Szilágyi
2015-04-17 16:45:44 +03:00
parent 182d484aa7
commit 3563c59b12
6 changed files with 132 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
xeth/xeth.go
View File

@ -452,14 +452,15 @@ func (self *XEth) AllLogs(earliest, latest int64, skip, max int, address []strin
return filter.Find()
}
func (p *XEth) NewWhisperFilter(opts *Options) int {
func (p *XEth) NewWhisperFilter(to, from string, topics []string) int {
var id int
opts.Fn = func(msg WhisperMessage) {
callback := func(msg WhisperMessage) {
p.messagesMut.Lock()
defer p.messagesMut.Unlock()
p.messages[id].add(msg) // = append(p.messages[id], msg)
p.messages[id].insert(msg)
}
id = p.Whisper().Watch(opts)
id = p.Whisper().Watch(to, from, topics, callback)
p.messages[id] = &whisperFilter{timeout: time.Now()}
return id
}
@ -478,7 +479,7 @@ func (self *XEth) MessagesChanged(id int) []WhisperMessage {
defer self.messagesMut.Unlock()
if self.messages[id] != nil {
return self.messages[id].get()
return self.messages[id].retrieve()
}
return nil
@ -731,22 +732,6 @@ func (m callmsg) Gas() *big.Int { return m.gas }
func (m callmsg) Value() *big.Int { return m.value }
func (m callmsg) Data() []byte { return m.data }
type whisperFilter struct {
messages []WhisperMessage
timeout time.Time
id int
}
func (w *whisperFilter) add(msgs ...WhisperMessage) {
w.messages = append(w.messages, msgs...)
}
func (w *whisperFilter) get() []WhisperMessage {
w.timeout = time.Now()
tmp := w.messages
w.messages = nil
return tmp
}
type logFilter struct {
logs state.Logs
timeout time.Time