Merge branch 'rpcxeth' into rpcfrontier

Conflicts: rpc/api.go
2015-03-20 15:25:43 +01:00
parent 41c493ace9 0cde7a4d46
commit 28e1971272
7 changed files with 554 additions and 667 deletions
--- a/core/filter.go
+++ b/core/filter.go
@ -46,7 +46,7 @@ func NewFilter(eth Backend) *Filter {

 // SetOptions copies the filter options to the filter it self. The reason for this "silly" copy
 // is simply because named arguments in this case is extremely nice and readable.
-func (self *Filter) SetOptions(options FilterOptions) {
+func (self *Filter) SetOptions(options *FilterOptions) {
 	self.earliest = options.Earliest
 	self.latest = options.Latest
 	self.skip = options.Skip