diff --git a/api/client.go b/api/client.go index e77b8954b5d6157a9f1b38ec2d4d3618628bdf35..a3f3c5db5ee67ca77502e088da3d977059c78420 100644 --- a/api/client.go +++ b/api/client.go @@ -196,7 +196,7 @@ func SetRateLimiting(limit uint32) { io.TransmitDelay = time.Duration(limit) * time.Millisecond } -func Listen(user *id.User, outerType format.OuterType, +func Listen(user *id.User, outerType format.CryptoType, messageType int32, newListener switchboard.Listener, callbacks *switchboard. Switchboard) string { listenerId := callbacks.Register(user, outerType, messageType, newListener) @@ -307,7 +307,7 @@ func (p ParsedMessage) GetRecipient()[]byte{ return []byte{} } -func (p ParsedMessage) GetType()int32{ +func (p ParsedMessage) GetMessageType()int32{ return p.Typed } @@ -323,7 +323,7 @@ func ParseMessage(message []byte)(ParsedMessage,error){ } pm.Payload = tb.Body - pm.Typed = int32(tb.InnerType) + pm.Typed = int32(tb.MessageType) return pm, nil } diff --git a/api/client_test.go b/api/client_test.go index 6bbb23e4a2e5e53cdc9ac3c1abfe87013c8cd687..2fb9b2c5442f4c67da8c840d7b0cae228ae6ef81 100644 --- a/api/client_test.go +++ b/api/client_test.go @@ -196,12 +196,12 @@ func TestParsedMessage_GetRecipient(t *testing.T) { } } -func TestParsedMessage_GetType(t *testing.T) { +func TestParsedMessage_GetMessageType(t *testing.T) { pm := ParsedMessage{} var typeTest int32 typeTest = 6 pm.Typed = typeTest - typ := pm.GetType() + typ := pm.GetMessageType() if typ!=typeTest{ t.Errorf("Returned type does not match") @@ -211,7 +211,7 @@ func TestParsedMessage_GetType(t *testing.T) { func TestParse(t *testing.T){ ms := parse.Message{} ms.Body = []byte{0,1,2} - ms.InnerType = int32(cmixproto.Type_NO_TYPE) + ms.MessageType = int32(cmixproto.Type_NO_TYPE) ms.Receiver = id.ZeroID ms.Sender = id.ZeroID @@ -223,8 +223,8 @@ func TestParse(t *testing.T){ t.Errorf("Message failed to parse: %s", err.Error()) } - if msOut.GetType()!=int32(ms.InnerType){ - t.Errorf("Types do not match after message parse: %v vs %v", msOut.GetType(), ms.InnerType) + if msOut.GetMessageType()!=int32(ms.MessageType){ + t.Errorf("Types do not match after message parse: %v vs %v", msOut.GetMessageType(), ms.MessageType) } if !reflect.DeepEqual(ms.Body,msOut.GetPayload()){ diff --git a/api/mockserver.go b/api/mockserver.go index e6399ea53e1f1891ae34ed5a8a864e79e8e1bc98..4c82719849f4bb6be25e461bfa92ca0f61b7098d 100644 --- a/api/mockserver.go +++ b/api/mockserver.go @@ -35,11 +35,11 @@ func (m APIMessage) GetPayload() []byte { return m.Payload } -func (m APIMessage) GetInnerType() int32 { +func (m APIMessage) GetMessageType() int32 { return int32(cmixproto.Type_NO_TYPE) } -func (m APIMessage) GetOuterType() format.OuterType { +func (m APIMessage) GetCryptoType() format.CryptoType { return format.None } diff --git a/bindings/client.go b/bindings/client.go index 8addfdd578a03d74fce55d4d66456910364c44e3..0fa0b1c4dbcc1dd859609605118fc06de7b8645a 100644 --- a/bindings/client.go +++ b/bindings/client.go @@ -45,7 +45,7 @@ type Message interface { // Returns the message's recipient ID GetRecipient() []byte // Returns the message's type - GetType() int32 + GetMessageType() int32 } // Translate a bindings message to a parse message @@ -194,10 +194,10 @@ func Send(m Message) error { return api.Send(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: m.GetType(), + MessageType: m.GetMessageType(), Body: m.GetPayload(), }, - OuterType: format.Unencrypted, + CryptoType: format.Unencrypted, Sender: sender, Receiver: recipient, }) diff --git a/bindings/client_test.go b/bindings/client_test.go index ba05868c0777f209b9ec86992b6cc36a86cdbd28..a1c2e160db5d622751b815fe2d60424c7e4b5c1d 100644 --- a/bindings/client_test.go +++ b/bindings/client_test.go @@ -231,7 +231,7 @@ func TestListen(t *testing.T) { Listen(id.ZeroID[:], int32(cmixproto.Type_NO_TYPE), &listener) switchboard.Listeners.Speak(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: 0, + MessageType: 0, Body: []byte("stuff"), }, Sender: id.ZeroID, @@ -248,7 +248,7 @@ func TestStopListening(t *testing.T) { StopListening(handle) switchboard.Listeners.Speak(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: 0, + MessageType: 0, Body: []byte("stuff"), }, Sender: id.ZeroID, @@ -281,7 +281,7 @@ func TestSetLogOutput(t *testing.T) { func TestParse(t *testing.T) { ms := parse.Message{} ms.Body = []byte{0, 1, 2} - ms.InnerType = int32(cmixproto.Type_NO_TYPE) + ms.MessageType = int32(cmixproto.Type_NO_TYPE) ms.Receiver = id.ZeroID ms.Sender = id.ZeroID @@ -293,8 +293,8 @@ func TestParse(t *testing.T) { t.Errorf("Message failed to parse: %s", err.Error()) } - if msOut.GetType() != int32(ms.InnerType) { - t.Errorf("Types do not match after message parse: %v vs %v", msOut.GetType(), ms.InnerType) + if msOut.GetMessageType() != int32(ms.MessageType) { + t.Errorf("Types do not match after message parse: %v vs %v", msOut.GetMessageType(), ms.MessageType) } if !reflect.DeepEqual(ms.Body, msOut.GetPayload()) { diff --git a/bindings/payment.go b/bindings/payment.go index f99e15987b3812dfff5bb934bd6d983c9e3a0b66..a2db5b0add29476538affb66f250b2ea9b0dbfb5 100644 --- a/bindings/payment.go +++ b/bindings/payment.go @@ -23,7 +23,7 @@ func GetActiveWallet() *Wallet { return &Wallet{wallet: api.Wallet()} } -func (w *Wallet) Listen(userId []byte, outerType format.OuterType, +func (w *Wallet) Listen(userId []byte, outerType format.CryptoType, innerType int32, newListener Listener) string { typedUserId := new(id.User).SetBytes(userId) diff --git a/bots/userDiscovery.go b/bots/userDiscovery.go index 057087f63c658407bd7e79ba1ea9f243ceff0989..ce4013d01e9ba758de19c7324f60ed01abe14767 100644 --- a/bots/userDiscovery.go +++ b/bots/userDiscovery.go @@ -77,7 +77,7 @@ func Register(valueType, value string, publicKey []byte) error { } msgBody := parse.Pack(&parse.TypedBody{ - InnerType: int32(cmixproto.Type_UDB_REGISTER), + MessageType: int32(cmixproto.Type_UDB_REGISTER), Body: []byte(fmt.Sprintf("%s %s %s", valueType, value, keyFP)), }) @@ -100,7 +100,7 @@ func Register(valueType, value string, publicKey []byte) error { func Search(valueType, value string) (*id.User, []byte, error) { globals.Log.DEBUG.Printf("Running search for %v, %v", valueType, value) msgBody := parse.Pack(&parse.TypedBody{ - InnerType: int32(cmixproto.Type_UDB_SEARCH), + MessageType: int32(cmixproto.Type_UDB_SEARCH), Body: []byte(fmt.Sprintf("%s %s", valueType, value)), }) err := sendCommand(UdbID, msgBody) @@ -120,7 +120,7 @@ func Search(valueType, value string) (*id.User, []byte, error) { // Get the full key and decode it msgBody = parse.Pack(&parse.TypedBody{ - InnerType: int32(cmixproto.Type_UDB_GET_KEY), + MessageType: int32(cmixproto.Type_UDB_GET_KEY), Body: []byte(keyFP), }) err = sendCommand(UdbID, msgBody) @@ -183,7 +183,7 @@ func pushKey(udbID *id.User, keyFP string, publicKey []byte) error { expected := fmt.Sprintf("PUSHKEY COMPLETE %s", keyFP) sendCommand(udbID, parse.Pack(&parse.TypedBody{ - InnerType: int32(cmixproto.Type_UDB_PUSH_KEY), + MessageType: int32(cmixproto.Type_UDB_PUSH_KEY), Body: []byte(fmt.Sprintf("%s %s", keyFP, publicKeyString)), })) response := <-pushKeyResponseListener @@ -197,7 +197,7 @@ func pushKey(udbID *id.User, keyFP string, publicKey []byte) error { func keyExists(udbID *id.User, keyFP string) bool { globals.Log.DEBUG.Printf("Running keyexists for %q, %v", *udbID, keyFP) cmd := parse.Pack(&parse.TypedBody{ - InnerType: int32(cmixproto.Type_UDB_GET_KEY), + MessageType: int32(cmixproto.Type_UDB_GET_KEY), Body: []byte(fmt.Sprintf("%s", keyFP)), }) expected := fmt.Sprintf("GETKEY %s NOTFOUND", keyFP) diff --git a/cmd/root.go b/cmd/root.go index 5029d528ecbc19e88a3f1c78fdb8865262cf9fc5..9b7b64008da7046ebfdbbf54e11ce394fee200f0 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -164,7 +164,7 @@ func (l *FallbackListener) Hear(item switchboard.Item, isHeardElsewhere bool) { } atomic.AddInt64(&l.messagesReceived, 1) fmt.Printf("Message of type %v from %q, %v received with fallback: %s\n", - message.InnerType, *message.Sender, senderNick, + message.MessageType, *message.Sender, senderNick, string(message.Body)) } } @@ -298,10 +298,10 @@ var rootCmd = &cobra.Command{ bindings.Send(&parse.BindingsMessageProxy{&parse.Message{ Sender: senderId, TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_TEXT_MESSAGE), + MessageType: int32(cmixproto.Type_TEXT_MESSAGE), Body: wireOut, }, - OuterType: format.Unencrypted, + CryptoType: format.Unencrypted, Receiver: recipientId, }}) } @@ -327,10 +327,10 @@ var rootCmd = &cobra.Command{ message := &parse.BindingsMessageProxy{&parse.Message{ Sender: senderId, TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_TEXT_MESSAGE), + MessageType: int32(cmixproto.Type_TEXT_MESSAGE), Body: bindings.FormatTextMessage(message), }, - OuterType: format.Unencrypted, + CryptoType: format.Unencrypted, Receiver: recipientId}} bindings.Send(message) diff --git a/io/collate.go b/io/collate.go index 708a2dd27561806d442fa52375f455b0be17800d..934519e10d7ad2a11b0eea68c19afecc3a234a9a 100644 --- a/io/collate.go +++ b/io/collate.go @@ -73,7 +73,7 @@ func (mb *collator) AddMessage(message *format.Message, msg := parse.Message{ TypedBody: *typedBody, - OuterType: format.Unencrypted, + CryptoType: format.Unencrypted, Sender: sender, Receiver: user.TheSession.GetCurrentUser().User, } @@ -138,7 +138,7 @@ func (mb *collator) AddMessage(message *format.Message, msg := parse.Message{ TypedBody: *typedBody, - OuterType: format.Unencrypted, + CryptoType: format.Unencrypted, Sender: sender, Receiver: recipient, } diff --git a/parse/body.go b/parse/body.go index e095cd669f582ef5b1cfc79e88157f10e722e8e8..f4408a032b2c5a2914d18eb1236e56a6fa229fe3 100644 --- a/parse/body.go +++ b/parse/body.go @@ -14,7 +14,7 @@ import ( // To allow mobile to bind this module if necessary, we'll return the two parts // of a body in a struct type TypedBody struct { - InnerType int32 + MessageType int32 Body []byte } @@ -27,7 +27,7 @@ func Parse(body []byte) (*TypedBody, error) { "Set a byte's most significant bit to 0 within the first 8 bytes.") } result := &TypedBody{} - result.InnerType = int32(messageType) + result.MessageType = int32(messageType) result.Body = body[numBytesRead:] return result, nil } @@ -35,7 +35,7 @@ func Parse(body []byte) (*TypedBody, error) { // Pack this message for the network func Pack(body *TypedBody) []byte { // Assumes that the underlying type of cmixproto.Type is int32 - return append(TypeAsBytes(int32(body.InnerType)), body.Body...) + return append(TypeAsBytes(int32(body.MessageType)), body.Body...) } // Mobile or other packages can use this wrapper to easily determine the diff --git a/parse/body_test.go b/parse/body_test.go index 10e7de0dc8f73ed84de9ea1824cc896c40e262f0..76fdf3d6f1352c382cf04beb09e7236c4c55fc8f 100644 --- a/parse/body_test.go +++ b/parse/body_test.go @@ -16,15 +16,15 @@ func TestParse(t *testing.T) { actual, err := Parse(body) expected := &TypedBody{} expected.Body = []byte{0x89, 0x02, 0x03, 0x04} - expected.InnerType = 256 + expected.MessageType = 256 if err != nil { t.Error(err.Error()) } - if actual.InnerType != expected.InnerType { + if actual.MessageType != expected.MessageType { t.Errorf("Body type didn't match. Expected: %v, actual: %v", - expected.InnerType, actual.InnerType) + expected.MessageType, actual.MessageType) } else if !bytes.Equal(actual.Body, expected.Body) { t.Errorf("Body didn't match. Expected: %v, actual: %v", expected.Body, actual.Body) @@ -54,7 +54,7 @@ func TestTypeAsBytes(t *testing.T) { func TestPack(t *testing.T) { expected := []byte{0x01, 0x02, 0x03, 0x04} actual := Pack(&TypedBody{ - InnerType: 1, + MessageType: 1, Body: []byte{0x02, 0x03, 0x04}, }) if !bytes.Equal(expected, actual) { diff --git a/parse/message.go b/parse/message.go index 35d00dadb40ade4587989bc150b8a00394b5b186..071929d1bd49517423417d2349468e2cfc960d36 100644 --- a/parse/message.go +++ b/parse/message.go @@ -19,7 +19,7 @@ type MessageHash [MessageHashLen]byte type Message struct { TypedBody - OuterType format.OuterType + CryptoType format.CryptoType Sender *id.User Receiver *id.User Nonce []byte @@ -36,9 +36,9 @@ type MessageInterface interface { // (uint64) BigEndian serialized into a byte slice GetRecipient() *id.User // Return the message's inner type - GetInnerType() int32 + GetMessageType() int32 // Returns the message's outer type - GetOuterType() format.OuterType + GetCryptoType() format.CryptoType // Return the message fully serialized including the type prefix // Does this really belong in the interface? Pack() []byte @@ -49,7 +49,7 @@ func (m Message) Hash() MessageHash { h := sha256.New() - h.Write(TypeAsBytes(int32(m.InnerType))) + h.Write(TypeAsBytes(int32(m.MessageType))) h.Write(m.Body) h.Write(m.Sender.Bytes()) h.Write(m.Receiver.Bytes()) @@ -74,12 +74,12 @@ func (m *Message) GetPayload() []byte { return m.Body } -func (m *Message) GetInnerType() int32 { - return m.InnerType +func (m *Message) GetMessageType() int32 { + return m.MessageType } -func (m *Message) GetOuterType() format.OuterType { - return m.OuterType +func (m *Message) GetCryptoType() format.CryptoType { + return m.CryptoType } func (m *Message) Pack() []byte { @@ -105,14 +105,14 @@ func (p *BindingsMessageProxy) GetPayload() []byte { return p.Proxy.GetPayload() } -func (p *BindingsMessageProxy) GetType() int32 { - return int32(p.Proxy.GetInnerType()) +func (p *BindingsMessageProxy) GetMessageType() int32 { + return int32(p.Proxy.GetMessageType()) } // Includes the type. Not sure if this is the right way to approach this. func (p *BindingsMessageProxy) Pack() []byte { return Pack(&TypedBody{ - InnerType: p.Proxy.GetInnerType(), + MessageType: p.Proxy.GetMessageType(), Body: p.Proxy.GetPayload(), }) } diff --git a/parse/message_test.go b/parse/message_test.go index 356390018cc3d11640409f2254e8de17758e7a28..85efdbbbad1a6f8086a1bd3ea41bbfe4468e3dbb 100644 --- a/parse/message_test.go +++ b/parse/message_test.go @@ -15,7 +15,7 @@ import ( //Shows that MessageHash ia an independent function of every field in Message func TestMessage_Hash(t *testing.T) { m := Message{} - m.InnerType = 0 + m.MessageType = 0 m.Body = []byte{0, 0} m.Sender = id.ZeroID m.Receiver = id.ZeroID @@ -23,7 +23,7 @@ func TestMessage_Hash(t *testing.T) { baseHash := m.Hash() - m.InnerType = 1 + m.MessageType = 1 typeHash := m.Hash() @@ -31,7 +31,7 @@ func TestMessage_Hash(t *testing.T) { t.Errorf("Message.Hash: Output did not change with modified type") } - m.InnerType = 0 + m.MessageType = 0 m.Body = []byte{1, 1} diff --git a/payment/transaction.go b/payment/transaction.go index 430811a199a8d756cda8fffc5fd33bf53445a093..1ab777bcd2ecb104f4cabd04a4b2500a00f14890 100644 --- a/payment/transaction.go +++ b/payment/transaction.go @@ -51,7 +51,7 @@ func (t *Transaction) FormatPaymentInvoice() *parse.Message { } typedBody := parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_INVOICE), + MessageType: int32(cmixproto.Type_PAYMENT_INVOICE), Body: wireRep, } @@ -61,7 +61,7 @@ func (t *Transaction) FormatPaymentInvoice() *parse.Message { // money Sender: t.Recipient, Receiver: t.Sender, - OuterType: format.Unencrypted, + CryptoType: 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 a3e7857de81635d234eb8e8d8abed5c8f4edf439..eedd7762b369a25199a7da390df33f64c66d0adf 100644 --- a/payment/wallet.go +++ b/payment/wallet.go @@ -219,9 +219,9 @@ func (il *InvoiceListener) Hear(msg switchboard.Item, isHeardElsewhere bool) { var invoice cmixproto.PaymentInvoice // Test for incorrect message type, just in case - if msg.GetInnerType() != int32(cmixproto.Type_PAYMENT_INVOICE) { + if msg.GetMessageType() != int32(cmixproto.Type_PAYMENT_INVOICE) { globals.Log.WARN.Printf("InvoiceListener: Got an invoice with the incorrect"+ - " type: %v", cmixproto.Type(msg.GetInnerType()).String()) + " type: %v", cmixproto.Type(msg.GetMessageType()).String()) return } @@ -270,10 +270,10 @@ func (il *InvoiceListener) Hear(msg switchboard.Item, isHeardElsewhere bool) { // invoice is here and ready to be paid il.wallet.switchboard.Speak(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_INVOICE_UI), + MessageType: int32(cmixproto.Type_PAYMENT_INVOICE_UI), Body: invoiceID[:], }, - OuterType: format.Unencrypted, + CryptoType: format.Unencrypted, Sender: getPaymentBotID(), Receiver: id.ZeroID, Nonce: nil, @@ -347,10 +347,10 @@ func (w *Wallet) pay(inboundRequest *Transaction) (*parse.Message, error) { msg := parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_TRANSACTION), + MessageType: int32(cmixproto.Type_PAYMENT_TRANSACTION), Body: paymentMessage, }, - OuterType: format.Unencrypted, + CryptoType: format.Unencrypted, Sender: w.session.GetCurrentUser().User, Receiver: getPaymentBotID(), // TODO panic on blank nonce @@ -442,10 +442,10 @@ func (l *ResponseListener) Hear(msg switchboard.Item, isHeardElsewhere bool) { func (l *ResponseListener) formatReceipt(transaction *Transaction) *parse.Message { return &parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_RECEIPT), + MessageType: int32(cmixproto.Type_PAYMENT_RECEIPT), Body: transaction.OriginID[:], }, - OuterType: format.Unencrypted, + CryptoType: format.Unencrypted, Sender: l.wallet.session.GetCurrentUser().User, Receiver: transaction.Recipient, Nonce: nil, @@ -472,10 +472,10 @@ func (rl *ReceiptListener) Hear(msg switchboard.Item, isHeardElsewhere bool) { // Let the payment receipt UI listeners know that a payment's come in rl.wallet.switchboard.Speak(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_RECEIPT_UI), + MessageType: int32(cmixproto.Type_PAYMENT_RECEIPT_UI), Body: invoiceID[:], }, - OuterType: format.Unencrypted, + CryptoType: format.Unencrypted, Sender: m.Sender, Receiver: id.ZeroID, Nonce: nil, diff --git a/payment/wallet_test.go b/payment/wallet_test.go index 2a53f13d87ddcbd3e748a35fb045fd55d96f9846..3d5766585c100edb5207bbe61d09cd7fc610d435 100644 --- a/payment/wallet_test.go +++ b/payment/wallet_test.go @@ -172,9 +172,9 @@ func TestWallet_Invoice(t *testing.T) { t.Errorf("Invoice receiver didn't match. Got: %v, expected %v", msg.Receiver, payer) } - if msg.InnerType != int32(cmixproto.Type_PAYMENT_INVOICE) { + if msg.MessageType != int32(cmixproto.Type_PAYMENT_INVOICE) { t.Errorf("Invoice type didn't match. Got: %v, expected %v", - cmixproto.Type(msg.InnerType).String(), + cmixproto.Type(msg.MessageType).String(), cmixproto.Type_PAYMENT_INVOICE.String()) } // Parse the body and make sure the fields are correct @@ -233,7 +233,7 @@ func TestInvoiceListener_Hear_Errors(t *testing.T) { // Test 1: incorrect message type invoiceListener.Hear(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_NO_TYPE), + MessageType: int32(cmixproto.Type_NO_TYPE), Body: nil, }}, false) @@ -244,7 +244,7 @@ func TestInvoiceListener_Hear_Errors(t *testing.T) { // Test 2: malformed proto buffer invoiceListener.Hear(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_INVOICE), + MessageType: int32(cmixproto.Type_PAYMENT_INVOICE), Body: []byte("fun fact: clownfish aren't actually very funny"), }, Sender: id.ZeroID, @@ -270,7 +270,7 @@ func TestInvoiceListener_Hear_Errors(t *testing.T) { invoiceListener.Hear(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_INVOICE), + MessageType: int32(cmixproto.Type_PAYMENT_INVOICE), Body: wireRep, }, }, false) @@ -289,7 +289,7 @@ func TestInvoiceListener_Hear_Errors(t *testing.T) { invoiceListener.Hear(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_INVOICE), + MessageType: int32(cmixproto.Type_PAYMENT_INVOICE), Body: wireRep, }, }, false) @@ -611,7 +611,7 @@ func TestResponseListener_Hear(t *testing.T) { listener.Hear(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_RESPONSE), + MessageType: int32(cmixproto.Type_PAYMENT_RESPONSE), Body: wire, }, Sender: payer, @@ -731,7 +731,7 @@ func TestResponseListener_Hear_Failure(t *testing.T) { listener := ResponseListener{wallet: &w} listener.Hear(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_RESPONSE), + MessageType: int32(cmixproto.Type_PAYMENT_RESPONSE), Body: wire, }, Sender: payer, @@ -1042,7 +1042,7 @@ func TestReceiptListener_Hear(t *testing.T) { listener.Hear(&parse.Message{ TypedBody: parse.TypedBody{ - InnerType: int32(cmixproto.Type_PAYMENT_RECEIPT), + MessageType: int32(cmixproto.Type_PAYMENT_RECEIPT), Body: invoiceID[:], }, Sender: invoice.Sender,