diff --git a/capability/policy/selector/supported_test.go b/capability/policy/selector/supported_test.go index 2f25316..fe47afe 100644 --- a/capability/policy/selector/supported_test.go +++ b/capability/policy/selector/supported_test.go @@ -4,7 +4,6 @@ import ( "bytes" _ "embed" "encoding/json" - "fmt" "strings" "testing" @@ -14,7 +13,6 @@ import ( basicnode "github.com/ipld/go-ipld-prime/node/basic" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/wI2L/jsondiff" "github.com/ucan-wg/go-ucan/v1/capability/policy/selector" ) @@ -150,27 +148,17 @@ func TestSupportedForms(t *testing.T) { func equalIPLD(t *testing.T, expected datamodel.Node, actual datamodel.Node, msgAndArgs ...interface{}) bool { t.Helper() - if !assert.ObjectsAreEqual(expected, actual) { - exp, act := &bytes.Buffer{}, &bytes.Buffer{} - if err := dagjson.Encode(expected, exp); err != nil { - return assert.Fail(t, "Failed to encode json for expected IPLD node") - } - - if err := dagjson.Encode(actual, act); err != nil { - return assert.Fail(t, "Failed to encode JSON for actual IPLD node") - } - - diff, err := jsondiff.CompareJSON(act.Bytes(), exp.Bytes()) - if err != nil { - return assert.Fail(t, "Failed to create diff of expected and actual IPLD nodes") - } - - return assert.Fail(t, fmt.Sprintf("Not equal: \n"+ - "expected: %s\n"+ - "actual: %s\n"+ - "diff: %s", exp, act, diff), msgAndArgs) + exp, act := &bytes.Buffer{}, &bytes.Buffer{} + if err := dagjson.Encode(expected, exp); err != nil { + return assert.Fail(t, "Failed to encode json for expected IPLD node") } + if err := dagjson.Encode(actual, act); err != nil { + return assert.Fail(t, "Failed to encode JSON for actual IPLD node") + } + + require.JSONEq(t, exp.String(), act.String()) + return true } diff --git a/go.mod b/go.mod index d36cf78..19a71aa 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/ucan-wg/go-ucan/v1 -go 1.22.1 +go 1.21 + +toolchain go1.22.1 require ( github.com/gobwas/glob v0.2.3 @@ -9,7 +11,6 @@ require ( github.com/multiformats/go-multibase v0.0.3 github.com/multiformats/go-varint v0.0.6 github.com/stretchr/testify v1.9.0 - github.com/wI2L/jsondiff v0.6.0 ) require ( @@ -23,10 +24,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/polydawn/refmt v0.89.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/tidwall/gjson v1.17.1 // indirect - github.com/tidwall/match v1.1.1 // indirect - github.com/tidwall/pretty v1.2.1 // indirect - github.com/tidwall/sjson v1.2.5 // indirect golang.org/x/crypto v0.1.0 // indirect golang.org/x/sys v0.1.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 930d7f4..abe7c04 100644 --- a/go.sum +++ b/go.sum @@ -57,19 +57,7 @@ github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0b github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U= -github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= -github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= -github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= -github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/wI2L/jsondiff v0.6.0 h1:zrsH3FbfVa3JO9llxrcDy/XLkYPLgoMX6Mz3T2PP2AI= -github.com/wI2L/jsondiff v0.6.0/go.mod h1:D6aQ5gKgPF9g17j+E9N7aasmU1O+XvfmWm1y8UMmNpw= github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ= github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=