Skip to content
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

Jump to bottom

chore: Rename orb client to anchor origin provider #897

Merged
merged 1 commit into from
Nov 25, 2021
Merged

chore: Rename orb client to anchor origin provider #897

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions pkg/discovery/endpoint/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/trustbloc/orb/pkg/activitypub/client/transport"
"github.com/trustbloc/orb/pkg/discovery/endpoint/client/models"
"github.com/trustbloc/orb/pkg/discovery/endpoint/restapi"
"github.com/trustbloc/orb/pkg/orbclient"
"github.com/trustbloc/orb/pkg/orbclient/aoprovider"
)

var logger = log.New("endpoint-client")
Expand Down Expand Up @@ -100,22 +100,22 @@ func New(docLoader ld.DocumentLoader, casReader casReader, opts ...Option) (*Cli
opt(configService)
}

var orbClientOpts []orbclient.Option
var orbClientOpts []aoprovider.Option

orbClientOpts = append(orbClientOpts, orbclient.WithJSONLDDocumentLoader(docLoader))
orbClientOpts = append(orbClientOpts, aoprovider.WithJSONLDDocumentLoader(docLoader))

if configService.disableProofCheck {
orbClientOpts = append(orbClientOpts, orbclient.WithDisableProofCheck(configService.disableProofCheck))
orbClientOpts = append(orbClientOpts, aoprovider.WithDisableProofCheck(configService.disableProofCheck))
} else {
orbClientOpts = append(orbClientOpts, orbclient.WithPublicKeyFetcher(
orbClientOpts = append(orbClientOpts, aoprovider.WithPublicKeyFetcher(
verifiable.NewVDRKeyResolver(vdr.New(vdr.WithVDR(&webVDR{
http: configService.httpClient,
VDR: web.New(),
}),
)).PublicKeyFetcher()))
}

orbClient, err := orbclient.New(configService.namespace, configService.casReader, orbClientOpts...)
orbClient, err := aoprovider.New(configService.namespace, configService.casReader, orbClientOpts...)
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/orbclient/client.go → ...client/aoprovider/anchororiginprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Copyright SecureKey Technologies Inc. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
*/

package orbclient
package aoprovider

import (
"encoding/json"
Expand All @@ -23,8 +23,8 @@ import (
"github.com/trustbloc/orb/pkg/anchor/util"
"github.com/trustbloc/orb/pkg/config"
"github.com/trustbloc/orb/pkg/context/common"
"github.com/trustbloc/orb/pkg/orbclient/nsprovider"
"github.com/trustbloc/orb/pkg/orbclient/verprovider"
"github.com/trustbloc/orb/pkg/orbclient/protocol/nsprovider"
"github.com/trustbloc/orb/pkg/orbclient/protocol/verprovider"
"github.com/trustbloc/orb/pkg/protocolversion/clientregistry"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/orbclient/client_test.go → ...t/aoprovider/anchororiginprovider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Copyright SecureKey Technologies Inc. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
*/

package orbclient
package aoprovider

import (
"testing"
Expand All @@ -23,7 +23,7 @@ import (
"github.com/trustbloc/orb/pkg/anchor/subject"
"github.com/trustbloc/orb/pkg/internal/testutil"
"github.com/trustbloc/orb/pkg/orbclient/mocks"
"github.com/trustbloc/orb/pkg/orbclient/nsprovider"
"github.com/trustbloc/orb/pkg/orbclient/protocol/nsprovider"
)

const testDID = "did"
Expand Down
2 changes: 1 addition & 1 deletion pkg/orbclient/mocks/clientversionprovider.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 pkg/orbclient/nsprovider/provider.go → .../protocol/nsprovider/namespaceprovider.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/orbclient/nsprovider/provider_test.go → ...ocol/nsprovider/namespaceprovider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/trustbloc/sidetree-core-go/pkg/api/protocol"
coremocks "github.com/trustbloc/sidetree-core-go/pkg/mocks"

"github.com/trustbloc/orb/pkg/orbclient/verprovider"
"github.com/trustbloc/orb/pkg/orbclient/protocol/verprovider"
)

const ns = "did:orb"
Expand Down
0 pkg/orbclient/verprovider/provider.go → ...t/protocol/verprovider/versionprovider.go
View file
Open in desktop
File renamed without changes.
0 pkg/orbclient/verprovider/provider_test.go → ...tocol/verprovider/versionprovider_test.go
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions pkg/orbclient/resolveverifier/verifier.go → .../resolutionverifier/resolutionverifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Copyright SecureKey Technologies Inc. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
*/

package resolveverifier
package resolutionverifier

import (
"bytes"
Expand All @@ -20,14 +20,14 @@ import (

"github.com/trustbloc/orb/pkg/config"
"github.com/trustbloc/orb/pkg/document/util"
"github.com/trustbloc/orb/pkg/orbclient/nsprovider"
"github.com/trustbloc/orb/pkg/orbclient/verprovider"
"github.com/trustbloc/orb/pkg/orbclient/protocol/nsprovider"
"github.com/trustbloc/orb/pkg/orbclient/protocol/verprovider"
"github.com/trustbloc/orb/pkg/protocolversion/clientregistry"
)

const unpublishedLabel = "uAAA"

// ResolutionVerifier resolves generic documents.
// ResolutionVerifier verifies resolved documents.
type ResolutionVerifier struct {
processor operationProcessor
protocol protocol.Client
Expand All @@ -45,7 +45,7 @@ type operationProcessor interface {
Resolve(suffix string, ops ...*operation.AnchoredOperation) (*protocol.ResolutionModel, error)
}

// Option is an option for document handler.
// Option is an option for document verifier.
type Option func(opts *ResolutionVerifier)

// New returns a new resolution verifier.
Expand Down Expand Up @@ -160,7 +160,7 @@ func (r *ResolutionVerifier) Verify(input *document.ResolutionResult) error {
}

func (r *ResolutionVerifier) resolveDocument(id string,
additionalOps ...*operation.AnchoredOperation) (*document.ResolutionResult, error) {
ops ...*operation.AnchoredOperation) (*document.ResolutionResult, error) {
pv, err := r.protocol.Current()
if err != nil {
return nil, err
Expand All @@ -171,7 +171,7 @@ func (r *ResolutionVerifier) resolveDocument(id string,
return nil, err
}

internalResult, err := r.processor.Resolve(suffix, additionalOps...)
internalResult, err := r.processor.Resolve(suffix, ops...)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion ...rbclient/resolveverifier/verifier_test.go → ...lutionverifier/resolutionverifier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Copyright SecureKey Technologies Inc. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
*/

package resolveverifier
package resolutionverifier

import (
"encoding/json"
Expand Down
12 changes: 6 additions & 6 deletions test/bdd/did_orb_steps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ import (
"github.com/trustbloc/orb/pkg/cas/ipfs"
"github.com/trustbloc/orb/pkg/discovery/endpoint/restapi"
"github.com/trustbloc/orb/pkg/mocks"
"github.com/trustbloc/orb/pkg/orbclient"
"github.com/trustbloc/orb/pkg/orbclient/resolveverifier"
"github.com/trustbloc/orb/pkg/orbclient/aoprovider"
"github.com/trustbloc/orb/pkg/orbclient/resolutionverifier"
)

var logger = logrus.New()
Expand Down Expand Up @@ -259,9 +259,9 @@ func (d *DIDOrbSteps) clientRequestsAnchorOrigin(url string) error {

casClient := ipfs.New(url, 20*time.Second, 0, &mocks.MetricsProvider{})

orbClient, err := orbclient.New(didDocNamespace, casClient,
orbclient.WithJSONLDDocumentLoader(docLoader),
orbclient.WithDisableProofCheck(true))
orbClient, err := aoprovider.New(didDocNamespace, casClient,
aoprovider.WithJSONLDDocumentLoader(docLoader),
aoprovider.WithDisableProofCheck(true))
if err != nil {
return err
}
Expand Down Expand Up @@ -289,7 +289,7 @@ func (d *DIDOrbSteps) clientRequestsAnchorOrigin(url string) error {
func (d *DIDOrbSteps) clientVerifiesResolvedDocument() error {
logger.Info("verify resolved document (client)")

verifier, err := resolveverifier.New("did:orb")
verifier, err := resolutionverifier.New("did:orb")
if err != nil {
return err
}
Expand Down