good morning!!!!

Skip to content
Snippets Groups Projects
Commit e40c1c62 authored by Jeffrey Wilcke's avatar Jeffrey Wilcke
Browse files

API changed to use Pubkey only. Reflected that change in the rest of the api

parent 6b5f2580
Branches
Tags
No related merge requests found
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
var web3 = require('web3'); var web3 = require('web3');
var eth = web3.eth; var eth = web3.eth;
web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080')); web3.setProvider(new
web3.providers.HttpSyncProvider('http://localhost:8545'));
var desc = [{ var desc = [{
"name": "balance(address)", "name": "balance(address)",
"type": "function", "type": "function",
......
...@@ -106,7 +106,7 @@ func (self *Whisper) Messages(id int) (messages *ethutil.List) { ...@@ -106,7 +106,7 @@ func (self *Whisper) Messages(id int) (messages *ethutil.List) {
func filterFromMap(opts map[string]interface{}) (f whisper.Filter) { func filterFromMap(opts map[string]interface{}) (f whisper.Filter) {
if to, ok := opts["to"].(string); ok { if to, ok := opts["to"].(string); ok {
f.To = crypto.ToECDSA(fromHex(to)) f.To = crypto.ToECDSAPub(fromHex(to))
} }
if from, ok := opts["from"].(string); ok { if from, ok := opts["from"].(string); ok {
f.From = crypto.ToECDSAPub(fromHex(from)) f.From = crypto.ToECDSAPub(fromHex(from))
......
...@@ -3,7 +3,7 @@ package whisper ...@@ -3,7 +3,7 @@ package whisper
import "crypto/ecdsa" import "crypto/ecdsa"
type Filter struct { type Filter struct {
To *ecdsa.PrivateKey To *ecdsa.PublicKey
From *ecdsa.PublicKey From *ecdsa.PublicKey
Topics [][]byte Topics [][]byte
Fn func(*Message) Fn func(*Message)
......
...@@ -118,7 +118,7 @@ func (self *Whisper) GetIdentity(key *ecdsa.PublicKey) *ecdsa.PrivateKey { ...@@ -118,7 +118,7 @@ func (self *Whisper) GetIdentity(key *ecdsa.PublicKey) *ecdsa.PrivateKey {
func (self *Whisper) Watch(opts Filter) int { func (self *Whisper) Watch(opts Filter) int {
return self.filters.Install(filter.Generic{ return self.filters.Install(filter.Generic{
Str1: string(crypto.FromECDSA(opts.To)), Str1: string(crypto.FromECDSAPub(opts.To)),
Str2: string(crypto.FromECDSAPub(opts.From)), Str2: string(crypto.FromECDSAPub(opts.From)),
Data: bytesToMap(opts.Topics), Data: bytesToMap(opts.Topics),
Fn: func(data interface{}) { Fn: func(data interface{}) {
......
...@@ -11,7 +11,7 @@ func TestEvent(t *testing.T) { ...@@ -11,7 +11,7 @@ func TestEvent(t *testing.T) {
whisper := New() whisper := New()
id := whisper.NewIdentity() id := whisper.NewIdentity()
whisper.Watch(Filter{ whisper.Watch(Filter{
To: id, To: &id.PublicKey,
Fn: func(msg *Message) { Fn: func(msg *Message) {
res <- msg res <- msg
}, },
......
...@@ -64,7 +64,7 @@ func (self *Whisper) HasIdentity(key string) bool { ...@@ -64,7 +64,7 @@ func (self *Whisper) HasIdentity(key string) bool {
func (self *Whisper) Watch(opts *Options) int { func (self *Whisper) Watch(opts *Options) int {
filter := whisper.Filter{ filter := whisper.Filter{
To: crypto.ToECDSA(fromHex(opts.To)), To: crypto.ToECDSAPub(fromHex(opts.To)),
From: crypto.ToECDSAPub(fromHex(opts.From)), From: crypto.ToECDSAPub(fromHex(opts.From)),
Topics: whisper.TopicsFromString(opts.Topics...), Topics: whisper.TopicsFromString(opts.Topics...),
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment