chore: update did-go dependency

Signed-off-by: Rolson Quadras <[email protected]>
trustbloc · Feb 14, 2024 · 8b8a881 · 8b8a881
1 parent 13c6488
commit 8b8a881
Show file tree

Hide file tree

Showing 24 changed files with 49 additions and 50 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.2
 	github.com/trustbloc/bbs-signature-go v1.0.2-0.20240117165819-e99610e107f4
-	github.com/trustbloc/did-go v1.1.1-0.20240117181910-cb9c77016955
+	github.com/trustbloc/did-go v1.1.1-0.20240214160354-aa500e57d8bd
 	github.com/trustbloc/kms-go v1.1.1-0.20240117181216-c38a74431167
 	golang.org/x/crypto v0.17.0
 )
@@ -28,7 +28,6 @@ require (
 	github.com/consensys/gnark-crypto v0.12.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect
 	github.com/kilic/bls12-381 v0.1.1-0.20210503002446-7b7597926c69 // indirect

diff --git a/go.sum b/go.sum
@@ -106,8 +106,8 @@ github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 h1:RBka
 github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8/go.mod h1:9PdLyPiZIiW3UopXyRnPYyjUXSpiQNHRLu8fOsR3o8M=
 github.com/trustbloc/bbs-signature-go v1.0.2-0.20240117165819-e99610e107f4 h1:YwwlqncHhg7q3W7TDj4yAM4sr9iZmNX5DfhU3Afpe04=
 github.com/trustbloc/bbs-signature-go v1.0.2-0.20240117165819-e99610e107f4/go.mod h1:xYotcXHAbcE0TO+SteW0J6XI3geQaXq4wdnXR2k+XCU=
-github.com/trustbloc/did-go v1.1.1-0.20240117181910-cb9c77016955 h1:pVe5+rmEzDuuK64cd3EjM0WtBMfm2T26xraGgv3r0Mg=
-github.com/trustbloc/did-go v1.1.1-0.20240117181910-cb9c77016955/go.mod h1:PXsxEF78QvuExNO3WkumlYvbrjLH+AN8P74D8IOMABo=
+github.com/trustbloc/did-go v1.1.1-0.20240214160354-aa500e57d8bd h1:GWZc0Q8BXb51YbyUZbQi+rD6DgkQV8SyUIBqwcOn4SU=
+github.com/trustbloc/did-go v1.1.1-0.20240214160354-aa500e57d8bd/go.mod h1:l02fEIibrursdYpf2uxWoU65dj2T9Mj0CCqh0mmVZQ8=
 github.com/trustbloc/kms-go v1.1.1-0.20240117181216-c38a74431167 h1:tgzKqzUJRLg0sY/BmHEDpMQ3TZOtC7u1RDYEMPeqnCI=
 github.com/trustbloc/kms-go v1.1.1-0.20240117181216-c38a74431167/go.mod h1:23chV97aYVcT3ihO8xO9+T0KZn9lFGbk2KXhJNaHbXE=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=

diff --git a/pkg/vdr/sidetreelongform/README.md b/pkg/vdr/sidetreelongform/README.md
@@ -6,7 +6,7 @@ Update, recover and deactivate operations are currently not supported.
 ```
 import (
 	"crypto"
-	"github.com/trustbloc/did-go/method/sidetreelongform"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform"
 )
 
 vdr, err := sidetreelongform.New()
@@ -29,7 +29,7 @@ ariesdid "github.com/hyperledger/aries-framework-go/pkg/doc/did"
 "github.com/hyperledger/aries-framework-go/pkg/doc/jose"
 vdrapi "github.com/hyperledger/aries-framework-go/pkg/framework/aries/api/vdr"
 
-"github.com/trustbloc/did-go/method/sidetreelongform"
+"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform"
 )
 
 recoveryKey, recoveryKeyPrivateKey, err := ed25519.GenerateKey(rand.Reader)

diff --git a/pkg/vdr/sidetreelongform/dochandler/dochandler.go b/pkg/vdr/sidetreelongform/dochandler/dochandler.go
@@ -21,10 +21,10 @@ import (
 	"github.com/trustbloc/sidetree-go/pkg/docutil"
 	"github.com/trustbloc/sidetree-go/pkg/encoder"
 
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocol/nsprovider"
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocol/verprovider"
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/clientregistry"
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/common"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocol/nsprovider"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocol/verprovider"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/common"
 )
 
 const (

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocol/nsprovider/namespaceprovider_test.go b/pkg/vdr/sidetreelongform/dochandler/protocol/nsprovider/namespaceprovider_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/trustbloc/sidetree-go/pkg/api/protocol"
 	coremocks "github.com/trustbloc/sidetree-go/pkg/mocks"
 
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocol/nsprovider"
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocol/verprovider"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocol/nsprovider"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocol/verprovider"
 )
 
 const ns = "did:ion"

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocol/verprovider/versionprovider_test.go b/pkg/vdr/sidetreelongform/dochandler/protocol/verprovider/versionprovider_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/trustbloc/sidetree-go/pkg/api/protocol"
 	coremocks "github.com/trustbloc/sidetree-go/pkg/mocks"
 
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocol/verprovider"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocol/verprovider"
 )
 
 func TestVersionprovider_New(t *testing.T) {

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry/clientregistry.go b/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry/clientregistry.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/trustbloc/sidetree-go/pkg/api/protocol"
 
-	vercommon "github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/common"
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/common"
+	vercommon "github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/common"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/common"
 )
 
 type factory interface {

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry/clientregistry_test.go b/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry/clientregistry_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/require"
 	coremocks "github.com/trustbloc/sidetree-go/pkg/mocks"
 
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/clientregistry"
-	crmocks "github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/clientregistry/mocks"
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/common"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry"
+	crmocks "github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry/mocks"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/common"
 )
 
 //go:generate counterfeiter -o ./mocks/clientfactory.gen.go --fake-name ClientFactory . factory

diff --git a/...vdr/sidetreelongform/dochandler/protocolversion/clientregistry/mocks/clientfactory.gen.go b/...vdr/sidetreelongform/dochandler/protocolversion/clientregistry/mocks/clientfactory.gen.go
diff --git a/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry/testversions.go b/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry/testversions.go
@@ -10,7 +10,7 @@ SPDX-License-Identifier: Apache-2.0
 package clientregistry
 
 import (
-	v1_0 "github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/v1_0/client"
+	v1_0 "github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/client"
 )
 
 const (

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry/versions.go b/pkg/vdr/sidetreelongform/dochandler/protocolversion/clientregistry/versions.go
@@ -9,7 +9,7 @@ SPDX-License-Identifier: Apache-2.0
 
 package clientregistry
 
-import v1_0 "github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/v1_0/client"
+import v1_0 "github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/client"
 
 const (
 	// V1_0 ...

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocolversion/common/version_test.go b/pkg/vdr/sidetreelongform/dochandler/protocolversion/common/version_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/common"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/common"
 )
 
 func TestCcVersion_Matches(t *testing.T) {

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/common/protocol_test.go b/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/common/protocol_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/trustbloc/sidetree-go/pkg/api/protocol"
 	coremocks "github.com/trustbloc/sidetree-go/pkg/mocks"
 
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/common"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/common"
 )
 
 func TestProtocolVersion(t *testing.T) {

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/client/client.go b/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/client/client.go
@@ -14,8 +14,8 @@ import (
 	"github.com/trustbloc/sidetree-go/pkg/versions/1_0/operationapplier"
 	"github.com/trustbloc/sidetree-go/pkg/versions/1_0/operationparser"
 
-	vcommon "github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/common"
-	protocolcfg "github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/v1_0/config"
+	vcommon "github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/common"
+	protocolcfg "github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/config"
 )
 
 // Factory implements version 0.1 of the client factory.

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/client/client_test.go b/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/client/client_test.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/common"
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/v1_0/client"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/common"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/client"
 )
 
 func TestFactory_Create(t *testing.T) {

diff --git a/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/config/protocol_test.go b/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/config/protocol_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler/protocolversion/versions/v1_0/config"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler/protocolversion/versions/v1_0/config"
 )
 
 func TestGetProtocolConfig(t *testing.T) {

diff --git a/pkg/vdr/sidetreelongform/sidetree/client.go b/pkg/vdr/sidetreelongform/sidetree/client.go
@@ -25,11 +25,11 @@ import (
 	"github.com/trustbloc/sidetree-go/pkg/versions/1_0/client"
 
 	docdid "github.com/trustbloc/did-go/doc/did"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/doc"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/create"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/deactivate"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/recovery"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/update"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/doc"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/create"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/deactivate"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/recovery"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/update"
 )
 
 const (

diff --git a/pkg/vdr/sidetreelongform/sidetree/client_test.go b/pkg/vdr/sidetreelongform/sidetree/client_test.go
@@ -30,12 +30,12 @@ import (
 
 	"github.com/trustbloc/did-go/doc/did"
 	model "github.com/trustbloc/did-go/doc/did/endpoint"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/doc"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/create"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/deactivate"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/recovery"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/update"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/doc"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/create"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/deactivate"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/recovery"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/update"
 )
 
 type didResolution struct {

diff --git a/pkg/vdr/sidetreelongform/sidetree/option/create/option.go b/pkg/vdr/sidetreelongform/sidetree/option/create/option.go
@@ -10,7 +10,7 @@ import (
 	"crypto"
 
 	docdid "github.com/trustbloc/did-go/doc/did"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/doc"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/doc"
 )
 
 // Opts create did opts.

diff --git a/pkg/vdr/sidetreelongform/sidetree/option/deactivate/option.go b/pkg/vdr/sidetreelongform/sidetree/option/deactivate/option.go
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package deactivate
 
 import (
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/api"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/api"
 )
 
 // Opts deactivate did opts.

diff --git a/pkg/vdr/sidetreelongform/sidetree/option/recovery/option.go b/pkg/vdr/sidetreelongform/sidetree/option/recovery/option.go
@@ -10,8 +10,8 @@ import (
 	"crypto"
 
 	docdid "github.com/trustbloc/did-go/doc/did"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/api"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/doc"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/api"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/doc"
 )
 
 // Opts recover did opts.

diff --git a/pkg/vdr/sidetreelongform/sidetree/option/update/option.go b/pkg/vdr/sidetreelongform/sidetree/option/update/option.go
@@ -10,8 +10,8 @@ import (
 	"crypto"
 
 	docdid "github.com/trustbloc/did-go/doc/did"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/api"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/doc"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/api"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/doc"
 )
 
 // Option is a update DID option.

diff --git a/pkg/vdr/sidetreelongform/vdr.go b/pkg/vdr/sidetreelongform/vdr.go
@@ -23,11 +23,11 @@ import (
 
 	docdid "github.com/trustbloc/did-go/doc/did"
 	"github.com/trustbloc/did-go/legacy/mem"
-	"github.com/trustbloc/did-go/method/sidetreelongform/dochandler"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/doc"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/create"
 	vdrapi "github.com/trustbloc/did-go/vdr/api"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/dochandler"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/doc"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/create"
 )
 
 const (

diff --git a/pkg/vdr/sidetreelongform/vdr_test.go b/pkg/vdr/sidetreelongform/vdr_test.go
@@ -19,10 +19,10 @@ import (
 	ld "github.com/trustbloc/did-go/doc/ld/documentloader"
 	mockldstore "github.com/trustbloc/did-go/doc/ld/mock"
 	ldstore "github.com/trustbloc/did-go/doc/ld/store"
-	"github.com/trustbloc/did-go/method/sidetreelongform/sidetree/option/create"
 	"github.com/trustbloc/kms-go/doc/jose/jwk"
 	"github.com/trustbloc/kms-go/doc/jose/jwk/jwksupport"
 	"github.com/trustbloc/sidetree-go/pkg/document"
+	"github.com/trustbloc/sidetree-go/pkg/vdr/sidetreelongform/sidetree/option/create"
 
 	ariesdid "github.com/trustbloc/did-go/doc/did"
 	model "github.com/trustbloc/did-go/doc/did/endpoint"