cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #136 from fjl/feature/raceless-ethereum-filters

Browse Source 
Fix chain filter data race
This commit is contained in:
Jeffrey Wilcke 2014-10-10 22:59:11 +02:00
commit 8128190fb2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mist/ui_lib.go
View File

@ -193,21 +193,21 @@ func (self *UiLib) StartDebugger() {
dbWindow.Show() dbWindow.Show()
} }
func (self *UiLib) NewFilter(object map[string]interface{}) int { func (self *UiLib) NewFilter(object map[string]interface{}) (id int) {
filter, id := self.eth.InstallFilter(object) filter := ethchain.NewFilterFromMap(object, self.eth)
filter.MessageCallback = func(messages ethstate.Messages) { filter.MessageCallback = func(messages ethstate.Messages) {
self.win.Root().Call("invokeFilterCallback", ethpipe.ToJSMessages(messages), id) self.win.Root().Call("invokeFilterCallback", ethpipe.ToJSMessages(messages), id)
} }
id = self.eth.InstallFilter(filter)
return id return id
} }
func (self *UiLib) NewFilterString(typ string) int { func (self *UiLib) NewFilterString(typ string) (id int) {
filter, id := self.eth.InstallFilter(nil) filter := ethchain.NewFilter(self.eth)
filter.BlockCallback = func(block *ethchain.Block) { filter.BlockCallback = func(block *ethchain.Block) {
self.win.Root().Call("invokeFilterCallback", "{}", id) self.win.Root().Call("invokeFilterCallback", "{}", id)
} }
id = self.eth.InstallFilter(filter)
return id return id
} }