From 4af7743663fa3e444668b90878f64d0df4316deb Mon Sep 17 00:00:00 2001
From: Péter Szilágyi <peterke@gmail.com>
Date: Tue, 14 Apr 2015 11:12:09 +0300
Subject: whisper: add utility functions for creating topics

---
 whisper/message.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'whisper/message.go')

diff --git a/whisper/message.go b/whisper/message.go
index ad31aa592..a4de18f65 100644
--- a/whisper/message.go
+++ b/whisper/message.go
@@ -30,7 +30,7 @@ type Options struct {
 	From   *ecdsa.PrivateKey
 	To     *ecdsa.PublicKey
 	TTL    time.Duration
-	Topics [][]byte
+	Topics []Topic
 }
 
 // NewMessage creates and initializes a non-signed, non-encrypted Whisper message.
@@ -75,13 +75,8 @@ func (self *Message) Wrap(pow time.Duration, options Options) (*Envelope, error)
 			return nil, err
 		}
 	}
-	// Convert the user topic into whisper ones
-	topics := make([]Topic, len(options.Topics))
-	for i, topic := range options.Topics {
-		topics[i] = NewTopic(topic)
-	}
 	// Wrap the processed message, seal it and return
-	envelope := NewEnvelope(options.TTL, topics, self)
+	envelope := NewEnvelope(options.TTL, options.Topics, self)
 	envelope.Seal(pow)
 
 	return envelope, nil
-- 
cgit