Changes after lorawan vendor update.

Author: brocaar

backend/mqttpubsub/backend_test.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/brocaar/loraserver/models"
+	"github.com/brocaar/lorawan"
 	"github.com/eclipse/paho.mqtt.golang"
 	. "github.com/smartystreets/goconvey/convey"
 )
@@ -44,6 +45,13 @@ func TestBackend(t *testing.T) {
 							MAC:  [8]byte{1, 2, 3, 4, 5, 6, 7, 8},
 							Time: time.Now().UTC(),
 						},
+						PHYPayload: lorawan.PHYPayload{
+							MHDR: lorawan.MHDR{
+								MType: lorawan.UnconfirmedDataUp,
+								Major: lorawan.LoRaWANR1,
+							},
+							MACPayload: &lorawan.MACPayload{},
+						},
 					}
 
 					err := backend.PublishGatewayRX([8]byte{1, 2, 3, 4, 5, 6, 7, 8}, rxPacket)
@@ -65,6 +73,13 @@ func TestBackend(t *testing.T) {
 						TXInfo: models.TXInfo{
 							MAC: [8]byte{1, 2, 3, 4, 5, 6, 7, 8},
 						},
+						PHYPayload: lorawan.PHYPayload{
+							MHDR: lorawan.MHDR{
+								MType: lorawan.UnconfirmedDataUp,
+								Major: lorawan.LoRaWANR1,
+							},
+							MACPayload: &lorawan.MACPayload{},
+						},
 					}
 					b, err := json.Marshal(txPacket)
 					So(err, ShouldBeNil)

gateway/backend.go

@@ -360,12 +360,8 @@ func newGatewayStatsPacket(mac lorawan.EUI64, stat Stat) models.GatewayStatsPack
 
 // newRXPacketFromRXPK transforms a Semtech packet into a models.RXPacket.
 func newRXPacketFromRXPK(mac lorawan.EUI64, rxpk RXPK) (models.RXPacket, error) {
-	phy := lorawan.NewPHYPayload(true) // uplink payload
-	bytes, err := base64.StdEncoding.DecodeString(rxpk.Data)
-	if err != nil {
-		return models.RXPacket{}, fmt.Errorf("could not base64 decode data: %s", err)
-	}
-	if err := phy.UnmarshalBinary(bytes); err != nil {
+	var phy lorawan.PHYPayload
+	if err := phy.UnmarshalText([]byte(rxpk.Data)); err != nil {
 		return models.RXPacket{}, fmt.Errorf("could not unmarshal PHYPayload: %s", err)
 	}
 
@@ -444,7 +440,7 @@ func newDataRateFromDatR(d DatR) (band.DataRate, error) {
 
 		dr.Modulation = band.LoRaModulation
 		dr.SpreadFactor = sf
-		dr.Bandwith = bw
+		dr.Bandwidth = bw
 		return dr, nil
 	}
 
@@ -460,7 +456,7 @@ func newDataRateFromDatR(d DatR) (band.DataRate, error) {
 func newDatRfromDataRate(d band.DataRate) DatR {
 	if d.Modulation == band.LoRaModulation {
 		return DatR{
-			LoRa: fmt.Sprintf("SF%dBW%d", d.SpreadFactor, d.Bandwith),
+			LoRa: fmt.Sprintf("SF%dBW%d", d.SpreadFactor, d.Bandwidth),
 		}
 	}
 

gateway/backend_test.go

@@ -135,12 +135,13 @@ func TestBackend(t *testing.T) {
 
 			Convey("Given a TXPacket", func() {
 				var nwkSKey lorawan.AES128Key
-				macPL := lorawan.NewMACPayload(false)
-				phy := lorawan.NewPHYPayload(false)
-				phy.MACPayload = macPL
-				phy.MHDR = lorawan.MHDR{
-					MType: lorawan.UnconfirmedDataDown,
-					Major: lorawan.LoRaWANR1,
+
+				phy := lorawan.PHYPayload{
+					MHDR: lorawan.MHDR{
+						MType: lorawan.UnconfirmedDataDown,
+						Major: lorawan.LoRaWANR1,
+					},
+					MACPayload: &lorawan.MACPayload{},
 				}
 				So(phy.SetMIC(nwkSKey), ShouldBeNil)
 
@@ -154,7 +155,7 @@ func TestBackend(t *testing.T) {
 						DataRate: band.DataRate{
 							Modulation:   band.LoRaModulation,
 							SpreadFactor: 12,
-							Bandwith:     250,
+							Bandwidth:    250,
 						},
 						CodeRate: "4/5",
 					},
@@ -198,7 +199,7 @@ func TestBackend(t *testing.T) {
 						var pullResp PullRespPacket
 						So(pullResp.UnmarshalBinary(buf[:i]), ShouldBeNil)
 
-						b, err := phy.MarshalBinary()
+						str, err := phy.MarshalText()
 						So(err, ShouldBeNil)
 
 						So(pullResp, ShouldResemble, PullRespPacket{
@@ -214,7 +215,7 @@ func TestBackend(t *testing.T) {
 									},
 									CodR: "4/5",
 									Size: uint16(len(b)),
-									Data: base64.StdEncoding.EncodeToString(b),
+									Data: string(str),
 									IPol: true,
 								},
 							},
@@ -288,7 +289,7 @@ func TestNewRXPacketFromRXPK(t *testing.T) {
 				b, err := base64.StdEncoding.DecodeString(rxpk.Data)
 				So(err, ShouldBeNil)
 
-				phy := lorawan.NewPHYPayload(true)
+				var phy lorawan.PHYPayload
 				So(phy.UnmarshalBinary(b), ShouldBeNil)
 
 				So(rxPacket.PHYPayload, ShouldResemble, phy)
@@ -304,7 +305,7 @@ func TestNewRXPacketFromRXPK(t *testing.T) {
 					DataRate: band.DataRate{
 						Modulation:   band.LoRaModulation,
 						SpreadFactor: 7,
-						Bandwith:     125,
+						Bandwidth:    125,
 					},
 					CodeRate: "4/5",
 					RSSI:     -51,