From 29850330789c9a0ce2b6351a9e370255b975e986 Mon Sep 17 00:00:00 2001 From: gammazero Date: Thu, 19 Nov 2020 17:38:08 -0800 Subject: [PATCH] Fix vet warnings about conversion of int to string Fixes issue #38 --- .travis.yml | 1 + multibase.go | 2 +- multibase_test.go | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09f9a4c..adfdd9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ language: go go: - 1.11.x + - 1.15.x env: global: diff --git a/multibase.go b/multibase.go index 87b8118..92975c2 100644 --- a/multibase.go +++ b/multibase.go @@ -84,7 +84,7 @@ func Encode(base Encoding, data []byte) (string, error) { switch base { case Identity: // 0x00 inside a string is OK in golang and causes no problems with the length calculation. - return string(Identity) + string(data), nil + return string(rune(Identity)) + string(data), nil case Base2: return string(Base2) + binaryEncodeToString(data), nil case Base16: diff --git a/multibase_test.go b/multibase_test.go index 12f24da..4f938d5 100644 --- a/multibase_test.go +++ b/multibase_test.go @@ -24,7 +24,7 @@ func TestMap(t *testing.T) { var sampleBytes = []byte("Decentralize everything!!!") var encodedSamples = map[Encoding]string{ - Identity: string(0x00) + "Decentralize everything!!!", + Identity: string(rune(0x00)) + "Decentralize everything!!!", Base2: "00100010001100101011000110110010101101110011101000111001001100001011011000110100101111010011001010010000001100101011101100110010101110010011110010111010001101000011010010110111001100111001000010010000100100001", Base16: "f446563656e7472616c697a652065766572797468696e67212121", Base16Upper: "F446563656E7472616C697A652065766572797468696E67212121", @@ -91,22 +91,22 @@ func TestRoundTrip(t *testing.T) { continue } - _, _, err := Decode(string(base) + "\u00A0") + _, _, err := Decode(string(rune(base)) + "\u00A0") if err == nil { t.Fatal(EncodingToStr[base] + " decode should fail on low-unicode") } - _, _, err = Decode(string(base) + "\u1F4A8") + _, _, err = Decode(string(rune(base)) + "\u1F4A8") if err == nil { t.Fatal(EncodingToStr[base] + " decode should fail on emoji") } - _, _, err = Decode(string(base) + "!") + _, _, err = Decode(string(rune(base)) + "!") if err == nil { t.Fatal(EncodingToStr[base] + " decode should fail on punctuation") } - _, _, err = Decode(string(base) + "\xA0") + _, _, err = Decode(string(rune(base)) + "\xA0") if err == nil { t.Fatal(EncodingToStr[base] + " decode should fail on high-latin1") }