Merge pull request #39 from gammazero/fix-vet-warnings
Fix vet warnings about conversion of int to string
This commit is contained in:
@@ -5,6 +5,7 @@ language: go
|
|||||||
|
|
||||||
go:
|
go:
|
||||||
- 1.11.x
|
- 1.11.x
|
||||||
|
- 1.15.x
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ func Encode(base Encoding, data []byte) (string, error) {
|
|||||||
switch base {
|
switch base {
|
||||||
case Identity:
|
case Identity:
|
||||||
// 0x00 inside a string is OK in golang and causes no problems with the length calculation.
|
// 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:
|
case Base2:
|
||||||
return string(Base2) + binaryEncodeToString(data), nil
|
return string(Base2) + binaryEncodeToString(data), nil
|
||||||
case Base16:
|
case Base16:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ func TestMap(t *testing.T) {
|
|||||||
|
|
||||||
var sampleBytes = []byte("Decentralize everything!!!")
|
var sampleBytes = []byte("Decentralize everything!!!")
|
||||||
var encodedSamples = map[Encoding]string{
|
var encodedSamples = map[Encoding]string{
|
||||||
Identity: string(0x00) + "Decentralize everything!!!",
|
Identity: string(rune(0x00)) + "Decentralize everything!!!",
|
||||||
Base2: "00100010001100101011000110110010101101110011101000111001001100001011011000110100101111010011001010010000001100101011101100110010101110010011110010111010001101000011010010110111001100111001000010010000100100001",
|
Base2: "00100010001100101011000110110010101101110011101000111001001100001011011000110100101111010011001010010000001100101011101100110010101110010011110010111010001101000011010010110111001100111001000010010000100100001",
|
||||||
Base16: "f446563656e7472616c697a652065766572797468696e67212121",
|
Base16: "f446563656e7472616c697a652065766572797468696e67212121",
|
||||||
Base16Upper: "F446563656E7472616C697A652065766572797468696E67212121",
|
Base16Upper: "F446563656E7472616C697A652065766572797468696E67212121",
|
||||||
@@ -91,22 +91,22 @@ func TestRoundTrip(t *testing.T) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
_, _, err := Decode(string(base) + "\u00A0")
|
_, _, err := Decode(string(rune(base)) + "\u00A0")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal(EncodingToStr[base] + " decode should fail on low-unicode")
|
t.Fatal(EncodingToStr[base] + " decode should fail on low-unicode")
|
||||||
}
|
}
|
||||||
|
|
||||||
_, _, err = Decode(string(base) + "\u1F4A8")
|
_, _, err = Decode(string(rune(base)) + "\u1F4A8")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal(EncodingToStr[base] + " decode should fail on emoji")
|
t.Fatal(EncodingToStr[base] + " decode should fail on emoji")
|
||||||
}
|
}
|
||||||
|
|
||||||
_, _, err = Decode(string(base) + "!")
|
_, _, err = Decode(string(rune(base)) + "!")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal(EncodingToStr[base] + " decode should fail on punctuation")
|
t.Fatal(EncodingToStr[base] + " decode should fail on punctuation")
|
||||||
}
|
}
|
||||||
|
|
||||||
_, _, err = Decode(string(base) + "\xA0")
|
_, _, err = Decode(string(rune(base)) + "\xA0")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal(EncodingToStr[base] + " decode should fail on high-latin1")
|
t.Fatal(EncodingToStr[base] + " decode should fail on high-latin1")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user