Skip to content

refactor: use slices.Equal to simplify code #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tsinghuacoder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: use slices.Equal to simplify code #995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions common/uint160_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package common
import (
"encoding/hex"
"encoding/json"
"slices"
"testing"
)

Expand All @@ -29,7 +30,7 @@ func TestMarshalJSON(t *testing.T) {
t.Fatalf("Unexpected error: %v", err)
}

if !bytesEqual(bytes, expected) {
if !slices.Equal(bytes, expected) {
t.Fatalf("Expected %v, got %v", expected, bytes)
}

Expand All @@ -38,7 +39,7 @@ func TestMarshalJSON(t *testing.T) {
t.Fatalf("Unexpected error: %v", err)
}

if !bytesEqual(bytes, expected) {
if !slices.Equal(bytes, expected) {
t.Fatalf("Expected %v, got %v", expected, bytes)
}

Expand All @@ -61,22 +62,10 @@ func TestUnmarshalJSON(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if !bytesEqual(f.ToArray(), expected) {
if !slices.Equal(f.ToArray(), expected) {
t.Fatalf("Expected %v, got %v", expected, f.ToArray())
}

// TODO: If possible, create a scenario where ToScriptHash returns an error
// and verify that UnmarshalJSON also returns this error.
}

func bytesEqual(a, b []byte) bool {
if len(a) != len(b) {
return false
}
for i, v := range a {
if v != b[i] {
return false
}
}
return true
}