diff --git a/go.mod b/go.mod index 5cfb7a6..0e032c2 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/antchfx/xpath v1.2.5 - github.com/fxamacker/cbor v1.5.1 + github.com/fxamacker/cbor/v2 v2.6.0 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/golang/protobuf v1.5.3 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index 1f3ee11..09ccb5b 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/antchfx/xpath v1.2.5 h1:hqZ+wtQ+KIOV/S3bGZcIhpgYC26um2bZYP2KVGcR7VY= github.com/antchfx/xpath v1.2.5/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fxamacker/cbor v1.5.1 h1:XjQWBgdmQyqimslUh5r4tUGmoqzHmBFQOImkWGi2awg= -github.com/fxamacker/cbor v1.5.1/go.mod h1:3aPGItF174ni7dDzd6JZ206H8cmr4GDNBGpPa971zsU= +github.com/fxamacker/cbor/v2 v2.6.0 h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1tWA= +github.com/fxamacker/cbor/v2 v2.6.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= diff --git a/node.go b/node.go index ac65943..3bb00a4 100644 --- a/node.go +++ b/node.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/fxamacker/cbor" + "github.com/fxamacker/cbor/v2" ) type keyValue struct { diff --git a/node_test.go b/node_test.go index ceb87b6..dfd4970 100644 --- a/node_test.go +++ b/node_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fxamacker/cbor" + "github.com/fxamacker/cbor/v2" "github.com/stretchr/testify/require" "github.com/srebhan/cborquery/testcases/addressbook" @@ -58,7 +58,7 @@ var addressbookSample = &addressbook.AddressBook{ } func TestParseAddressBookXML(t *testing.T) { - msg, err := cbor.Marshal(addressbookSample, cbor.EncOptions{}) + msg, err := cbor.Marshal(addressbookSample) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -77,7 +77,7 @@ func TestNumericKeys(t *testing.T) { 3.14: 42.3, "test": 23, } - msg, err := cbor.Marshal(test, cbor.EncOptions{}) + msg, err := cbor.Marshal(test) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -107,7 +107,7 @@ func TestArray(t *testing.T) { 99: 3.1415, }, } - msg, err := cbor.Marshal(test, cbor.EncOptions{}) + msg, err := cbor.Marshal(test) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) diff --git a/query_test.go b/query_test.go index edbd6ba..fe2a996 100644 --- a/query_test.go +++ b/query_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/antchfx/xpath" - "github.com/fxamacker/cbor" + "github.com/fxamacker/cbor/v2" "github.com/stretchr/testify/require" ) @@ -34,7 +34,7 @@ func BenchmarkDisableSelectorCache(b *testing.B) { } func TestNavigator(t *testing.T) { - msg, err := cbor.Marshal(addressbookSample, cbor.EncOptions{}) + msg, err := cbor.Marshal(addressbookSample) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -78,7 +78,7 @@ func TestNavigator(t *testing.T) { } func TestQueryNames(t *testing.T) { - msg, err := cbor.Marshal(addressbookSample, cbor.EncOptions{}) + msg, err := cbor.Marshal(addressbookSample) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -116,7 +116,7 @@ func TestQueryNames(t *testing.T) { } func TestQueryPhoneNumberFirst(t *testing.T) { - msg, err := cbor.Marshal(addressbookSample, cbor.EncOptions{}) + msg, err := cbor.Marshal(addressbookSample) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -137,7 +137,7 @@ func TestQueryPhoneNumberFirst(t *testing.T) { } func TestQueryPhoneNumberLast(t *testing.T) { - msg, err := cbor.Marshal(addressbookSample, cbor.EncOptions{}) + msg, err := cbor.Marshal(addressbookSample) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -158,7 +158,7 @@ func TestQueryPhoneNumberLast(t *testing.T) { } func TestQueryPhoneNoEmail(t *testing.T) { - msg, err := cbor.Marshal(addressbookSample, cbor.EncOptions{}) + msg, err := cbor.Marshal(addressbookSample) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -172,7 +172,7 @@ func TestQueryPhoneNoEmail(t *testing.T) { } func TestQueryPhoneAge(t *testing.T) { - msg, err := cbor.Marshal(addressbookSample, cbor.EncOptions{}) + msg, err := cbor.Marshal(addressbookSample) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -193,7 +193,7 @@ func TestQueryPhoneAge(t *testing.T) { } func TestQueryJack(t *testing.T) { - msg, err := cbor.Marshal(addressbookSample, cbor.EncOptions{}) + msg, err := cbor.Marshal(addressbookSample) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -210,7 +210,7 @@ func TestQueryJack(t *testing.T) { } func TestQueryExample(t *testing.T) { - msg, err := cbor.Marshal(addressbookSample, cbor.EncOptions{}) + msg, err := cbor.Marshal(addressbookSample) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg)) @@ -252,7 +252,7 @@ func TestQueryNode(t *testing.T) { 266: false, }, } - msg, err := cbor.Marshal(test, cbor.EncOptions{}) + msg, err := cbor.Marshal(test) require.NoError(t, err) doc, err := Parse(bytes.NewBuffer(msg))