diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-03-04 21:04:07 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-03-04 21:04:07 +0800 |
| commit | 5f25c117eb6a1145b18fc13ebc03e4dc570b908e (patch) | |
| tree | f5296850d29c08179ac9f51c925463d880e2db08 /rpc/util.go | |
| parent | cf880f78d5e85d563654ac8277c1d51bf8c382c2 (diff) | |
| parent | a56243075a7527d65d14c4cf3480029feb0a1e3f (diff) | |
| download | dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.gz dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.bz2 dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.lz dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.xz dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.tar.zst dexon-5f25c117eb6a1145b18fc13ebc03e4dc570b908e.zip | |
Merge branch 'develop' into ui
Diffstat (limited to 'rpc/util.go')
| -rw-r--r-- | rpc/util.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rpc/util.go b/rpc/util.go index 1939b3474..3e8ca3fef 100644 --- a/rpc/util.go +++ b/rpc/util.go @@ -82,7 +82,7 @@ type RpcServer interface { type Log struct { Address string `json:"address"` - Topic []string `json:"topics"` + Topic []string `json:"topic"` Data string `json:"data"` Number uint64 `json:"number"` } @@ -108,6 +108,7 @@ func toLogs(logs state.Logs) (ls []Log) { type whisperFilter struct { messages []xeth.WhisperMessage timeout time.Time + id int } func (w *whisperFilter) add(msgs ...xeth.WhisperMessage) { @@ -123,6 +124,7 @@ func (w *whisperFilter) get() []xeth.WhisperMessage { type logFilter struct { logs state.Logs timeout time.Time + id int } func (l *logFilter) add(logs ...state.Log) { |