Fix some utilities functions

Author: silvanocerza

flasher/certificate.go

@@ -51,35 +51,35 @@ func calculateNameSha1(cert *x509.Certificate) (b []byte, err error) {
 	return
 }
 
-func convertTime(time time.Time) (b []byte, err error) {
+func convertTime(time time.Time) ([]byte, error) {
 	asn1Bytes, err := asn1.Marshal(time)
 	if err != nil {
 		logrus.Error(err)
 		return nil, err
 	}
 
-	b = bytes.Repeat([]byte{0x00}, 20) // value must be zero bytes
-	copy(b, asn1Bytes[2:])             // copy but drop the first two bytes
+	b := bytes.Repeat([]byte{0x00}, 20) // value must be zero bytes
+	copy(b, asn1Bytes[2:])              // copy but drop the first two bytes
 
-	return
+	return b, err
 }
 
 func modulusN(publicKey rsa.PublicKey) []byte {
 	return publicKey.N.Bytes()
 }
 
-func publicExponent(publicKey rsa.PublicKey) (b []byte) {
-	b = make([]byte, 4)
+func publicExponent(publicKey rsa.PublicKey) []byte {
+	b := make([]byte, 4)
 	binary.BigEndian.PutUint32(b, uint32(publicKey.E))
 	// strip leading zeros
 	for b[0] == 0 {
 		b = b[1:]
 	}
-	return
+	return b
 }
 
-func uint16ToBytes(i int) (b []byte) {
-	b = make([]byte, 2)
+func uint16ToBytes(i int) []byte {
+	b := make([]byte, 2)
 	binary.LittleEndian.PutUint16(b, uint16(i))
-	return
+	return b
 }

indexes/firmwareindex/firmwareindex_test.go

@@ -6,7 +6,6 @@
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
   version 2.1 of the License, or (at your option) any later version.
-
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -38,41 +37,38 @@ func TestIndexParsing(t *testing.T) {
 	require.NotEmpty(t, index)
 }
 
-func TestGetLatestFirmwareURL(t *testing.T) {
+func TestGetLatestFirmware(t *testing.T) {
 	indexFile := paths.New("testdata/module_firmware_index.json")
 	t.Logf("testing with index: %s", indexFile)
 	index, e := LoadIndexNoSign(indexFile)
 	require.NoError(t, e)
 	require.NotEmpty(t, index)
 
-	result, err := index.GetLatestFirmwareURL("arduino:samd:mkr1000")
-	require.NoError(t, err)
-	require.NotEmpty(t, result)
-	require.Equal(t, "https://downloads.arduino.cc/arduino-fwuploader/firmwares/WINC1500/19.6.1/m2m_aio_3a0.bin", result)
+	firmware := index.GetLatestFirmware("arduino:samd:mkr1000")
+	require.Equal(t, firmware.Version, "19.6.1")
 
-	result, err = index.GetLatestFirmwareURL("arduino:samd:mkr1001")
-	require.Error(t, err)
-	require.Empty(t, result)
+	firmware = index.GetLatestFirmware("arduino:samd:mkr1001")
+	require.Nil(t, firmware)
 }
 
-func TestGetFirmwareURL(t *testing.T) {
+func TestGetFirmware(t *testing.T) {
 	indexFile := paths.New("testdata/module_firmware_index.json")
 	t.Logf("testing with index: %s", indexFile)
 	index, e := LoadIndexNoSign(indexFile)
 	require.NoError(t, e)
 	require.NotEmpty(t, index)
 
-	result, err := index.GetFirmwareURL("arduino:samd:mkr1000", "19.6.1")
-	require.NoError(t, err)
-	require.NotEmpty(t, result)
+	firmware := index.GetFirmware("arduino:samd:mkr1000", "19.6.1")
+	require.Equal(t, firmware.Version, "19.6.1")
 
-	result, err = index.GetFirmwareURL("arduino:samd:mkr1000", "0.0.0")
-	require.Error(t, err)
-	require.Empty(t, result)
+	firmware = index.GetFirmware("arduino:samd:mkr1000", "19.5.2")
+	require.Equal(t, firmware.Version, "19.5.2")
 
-	result, err = index.GetFirmwareURL("arduino:samd:mkr1001", "19.6.1")
-	require.Error(t, err)
-	require.Empty(t, result)
+	firmware = index.GetFirmware("arduino:samd:mkr1000", "0.0.0")
+	require.Nil(t, firmware)
+
+	firmware = index.GetFirmware("arduino:samd:mkr1001", "19.6.1")
+	require.Nil(t, firmware)
 }
 
 func TestGetLoaderSketchURL(t *testing.T) {