Skip to content

Commit

Permalink
Merge pull request #39 from gammazero/fix-vet-warnings
Browse files Browse the repository at this point in the history
Fix vet warnings about conversion of int to string
  • Loading branch information
Stebalien authored Feb 26, 2021
2 parents e2260b5 + 2985033 commit 95cb707
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ language: go

go:
- 1.11.x
- 1.15.x

env:
global:
Expand Down
2 changes: 1 addition & 1 deletion multibase.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions multibase_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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")
}
Expand Down

0 comments on commit 95cb707

Please sign in to comment.