diff --git a/bindings/client.go b/bindings/client.go
index f8ba31f91958b43440030298e1bbcfb4624a8bd8..cb9d06f5bac7fc611c9c929424128d279ead9697 100644
--- a/bindings/client.go
+++ b/bindings/client.go
@@ -11,12 +11,12 @@ import (
"gitlab.com/elixxir/client/api"
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/parse"
- "gitlab.com/elixxir/primitives/switchboard"
"gitlab.com/elixxir/client/user"
"gitlab.com/elixxir/crypto/certs"
+ "gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
+ "gitlab.com/elixxir/primitives/switchboard"
"io"
- "gitlab.com/elixxir/primitives/format"
)
// Copy of the storage interface.
@@ -75,7 +75,6 @@ func Listen(userId []byte, messageType int32, newListener Listener) string {
// Returns a parsed message
-
// Pass the listener handle that Listen() returned to delete the listener
func StopListening(listenerHandle string) {
api.StopListening(listenerHandle, switchboard.Listeners)
@@ -195,10 +194,11 @@ func Send(m Message) error {
return api.Send(&parse.Message{
TypedBody: parse.TypedBody{
InnerType: m.GetType(),
- Body: m.GetPayload(),
+ Body: m.GetPayload(),
},
- Sender: sender,
- Receiver: recipient,
+ OuterType: format.Unencrypted,
+ Sender: sender,
+ Receiver: recipient,
})
}
@@ -240,7 +240,7 @@ func SearchForUser(emailAddress string) (*SearchResult, error) {
// Parses a passed message. Allows a message to be aprsed using the interal parser
// across the Bindings
-func ParseMessage(message []byte)(Message, error){
+func ParseMessage(message []byte) (Message, error) {
return api.ParseMessage(message)
}
diff --git a/cmd/root.go b/cmd/root.go
index 03d09c34a50768b6602b94d00505a946130f6e41..2aed932cfc4baafb7819e59c322e913f4266c93e 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -19,17 +19,17 @@ import (
"gitlab.com/elixxir/client/cmixproto"
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/parse"
- "gitlab.com/elixxir/primitives/switchboard"
"gitlab.com/elixxir/client/user"
"gitlab.com/elixxir/comms/connect"
+ "gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
+ "gitlab.com/elixxir/primitives/switchboard"
"io/ioutil"
"log"
"math/big"
"os"
"sync/atomic"
"time"
- "gitlab.com/elixxir/primitives/format"
)
var verbose bool
@@ -288,8 +288,9 @@ var rootCmd = &cobra.Command{
Sender: senderId,
TypedBody: parse.TypedBody{
InnerType: int32(cmixproto.Type_TEXT_MESSAGE),
- Body: wireOut,
+ Body: wireOut,
},
+ OuterType: format.Unencrypted,
Receiver: recipientId,
}})
}
@@ -316,9 +317,10 @@ var rootCmd = &cobra.Command{
Sender: senderId,
TypedBody: parse.TypedBody{
InnerType: int32(cmixproto.Type_TEXT_MESSAGE),
- Body: bindings.FormatTextMessage(message),
+ Body: bindings.FormatTextMessage(message),
},
- Receiver: recipientId}}
+ OuterType: format.Unencrypted,
+ Receiver: recipientId}}
bindings.Send(message)
timer = time.NewTimer(dummyPeriod)
diff --git a/io/collate.go b/io/collate.go
index 31956f43c406564fc300fc09a776f70d987e407b..708a2dd27561806d442fa52375f455b0be17800d 100644
--- a/io/collate.go
+++ b/io/collate.go
@@ -73,6 +73,7 @@ func (mb *collator) AddMessage(message *format.Message,
msg := parse.Message{
TypedBody: *typedBody,
+ OuterType: format.Unencrypted,
Sender: sender,
Receiver: user.TheSession.GetCurrentUser().User,
}
@@ -137,6 +138,7 @@ func (mb *collator) AddMessage(message *format.Message,
msg := parse.Message{
TypedBody: *typedBody,
+ OuterType: format.Unencrypted,
Sender: sender,
Receiver: recipient,
}
diff --git a/payment/transaction.go b/payment/transaction.go
index 0d11366aaf3ad231e77b6d5da89a426df2163d66..430811a199a8d756cda8fffc5fd33bf53445a093 100644
--- a/payment/transaction.go
+++ b/payment/transaction.go
@@ -11,6 +11,7 @@ import (
"gitlab.com/elixxir/client/cmixproto"
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/crypto/coin"
+ "gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
"time"
)
@@ -51,15 +52,16 @@ func (t *Transaction) FormatPaymentInvoice() *parse.Message {
typedBody := parse.TypedBody{
InnerType: int32(cmixproto.Type_PAYMENT_INVOICE),
- Body: wireRep,
+ Body: wireRep,
}
return &parse.Message{
TypedBody: typedBody,
// The person who sends the invoice is the one who will receive the
// money
- Sender: t.Recipient,
- Receiver: t.Sender,
+ Sender: t.Recipient,
+ Receiver: t.Sender,
+ OuterType: format.Unencrypted,
// TODO populate nonce and panic if any outgoing message has none
Nonce: nil,
}
diff --git a/payment/wallet.go b/payment/wallet.go
index 097ccd1c71c9ac34a3fc17728e75ed3828ec962a..a3e7857de81635d234eb8e8d8abed5c8f4edf439 100644
--- a/payment/wallet.go
+++ b/payment/wallet.go
@@ -271,11 +271,12 @@ func (il *InvoiceListener) Hear(msg switchboard.Item, isHeardElsewhere bool) {
il.wallet.switchboard.Speak(&parse.Message{
TypedBody: parse.TypedBody{
InnerType: int32(cmixproto.Type_PAYMENT_INVOICE_UI),
- Body: invoiceID[:],
+ Body: invoiceID[:],
},
- Sender: getPaymentBotID(),
- Receiver: id.ZeroID,
- Nonce: nil,
+ OuterType: format.Unencrypted,
+ Sender: getPaymentBotID(),
+ Receiver: id.ZeroID,
+ Nonce: nil,
})
}
@@ -347,10 +348,11 @@ func (w *Wallet) pay(inboundRequest *Transaction) (*parse.Message, error) {
msg := parse.Message{
TypedBody: parse.TypedBody{
InnerType: int32(cmixproto.Type_PAYMENT_TRANSACTION),
- Body: paymentMessage,
+ Body: paymentMessage,
},
- Sender: w.session.GetCurrentUser().User,
- Receiver: getPaymentBotID(),
+ OuterType: format.Unencrypted,
+ Sender: w.session.GetCurrentUser().User,
+ Receiver: getPaymentBotID(),
// TODO panic on blank nonce
Nonce: nil,
}
@@ -441,11 +443,12 @@ func (l *ResponseListener) formatReceipt(transaction *Transaction) *parse.Messag
return &parse.Message{
TypedBody: parse.TypedBody{
InnerType: int32(cmixproto.Type_PAYMENT_RECEIPT),
- Body: transaction.OriginID[:],
+ Body: transaction.OriginID[:],
},
- Sender: l.wallet.session.GetCurrentUser().User,
- Receiver: transaction.Recipient,
- Nonce: nil,
+ OuterType: format.Unencrypted,
+ Sender: l.wallet.session.GetCurrentUser().User,
+ Receiver: transaction.Recipient,
+ Nonce: nil,
}
}
@@ -470,11 +473,12 @@ func (rl *ReceiptListener) Hear(msg switchboard.Item, isHeardElsewhere bool) {
rl.wallet.switchboard.Speak(&parse.Message{
TypedBody: parse.TypedBody{
InnerType: int32(cmixproto.Type_PAYMENT_RECEIPT_UI),
- Body: invoiceID[:],
+ Body: invoiceID[:],
},
- Sender: m.Sender,
- Receiver: id.ZeroID,
- Nonce: nil,
+ OuterType: format.Unencrypted,
+ Sender: m.Sender,
+ Receiver: id.ZeroID,
+ Nonce: nil,
})
}
}