diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 6387af06aa..197265438b 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -9,7 +9,7 @@ body: _The more information you share, the faster we can help you._ Prior to opening the issue, please make sure that you: - Use English (EN/US) to communicate. - - Search the [open issues](https://github.com/hyperledger/firefly/issues) to avoid duplicating the issue. + - Search the [open issues](https://github.com/hyperledger-firefly/firefly/issues) to avoid duplicating the issue. - type: textarea id: problem diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml index 7ba36d42b2..895f498064 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.yml +++ b/.github/ISSUE_TEMPLATE/enhancement.yml @@ -8,7 +8,7 @@ body: _The more information you share, the faster we can help you._ Prior to opening the issue, please make sure that you: - Use English (EN/US) to communicate. - - Search the [open issues](https://github.com/hyperledger/firefly/issues) to avoid duplicating the issue. + - Search the [open issues](https://github.com/hyperledger-firefly/firefly/issues) to avoid duplicating the issue. - type: textarea id: enhancement diff --git a/.github/ISSUE_TEMPLATE/improve_docs.yml b/.github/ISSUE_TEMPLATE/improve_docs.yml index 13220bcdc2..5854606998 100644 --- a/.github/ISSUE_TEMPLATE/improve_docs.yml +++ b/.github/ISSUE_TEMPLATE/improve_docs.yml @@ -9,7 +9,7 @@ body: _The more information you share, the faster we can help you._ Prior to opening the issue, please make sure that you: - Use English (EN/US) to communicate. - - Search the [open issues](https://github.com/hyperledger/firefly/issues) to avoid duplicating the issue. + - Search the [open issues](https://github.com/hyperledger-firefly/firefly/issues) to avoid duplicating the issue. - type: textarea id: current-state diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 3c416865df..89f6d00e4b 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -156,10 +156,6 @@ jobs: - name: Load Docker image run: docker load --input firefly.tar.gz - # Temporary to pass e2e jobs during migration - - name: Re-tag Docker image - run: docker tag hyperledger-firefly/firefly hyperledger/firefly - # Pre-pull fabric-ccenv so the Fabric peer's chaincode build finds it. Required on # GitHub Actions with Docker 29: the peer invokes the host Docker build API to build # chaincode (FROM hyperledger/fabric-ccenv:2.5); with Docker 29/containerd image store diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 24b49d9d40..ae80f4e404 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -64,8 +64,8 @@ jobs: - name: Pull latest FireFly build run: | - docker pull ghcr.io/hyperledger/firefly:head - docker tag ghcr.io/hyperledger/firefly:head hyperledger/firefly + docker pull ghcr.io/hyperledger-firefly/firefly:head + docker tag ghcr.io/hyperledger-firefly/firefly:head hyperledger-firefly/firefly - name: Run E2E tests env: @@ -101,8 +101,8 @@ jobs: - name: Pull latest FireFly build run: | - docker pull ghcr.io/hyperledger/firefly:head - docker tag ghcr.io/hyperledger/firefly:head hyperledger/firefly + docker pull ghcr.io/hyperledger-firefly/firefly:head + docker tag ghcr.io/hyperledger-firefly/firefly:head hyperledger-firefly/firefly - name: Run E2E tests env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 079d2a7577..7b5df861f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ # Changelog -See [Hyperledger FireFly Releases](https://github.com/hyperledger/firefly/releases) +See [Hyperledger FireFly Releases](https://github.com/hyperledger-firefly/firefly/releases) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6591fd2c19..7b33717c4c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ We welcome contributions to the FireFly Project in many forms, and there's always plenty to do! Please visit the -[contributors guide](https://hyperledger.github.io/firefly/latest/contributors/index.html) in the +[contributors guide](https://hyperledger-firefly.github.io/firefly/latest/contributors/index.html) in the docs to learn how to make contributions to this exciting project. Creative Commons License
This work is licensed under a Creative Commons Attribution 4.0 International License. diff --git a/Dockerfile b/Dockerfile index 12e3c54548..7ae2cdf42d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # ARG Definitions # Consider adding default values for the ARGs based on this warning: -# https://github.com/hyperledger/firefly/actions/runs/10795366695/job/29941873807#step:4:171 +# https://github.com/hyperledger-firefly/firefly/actions/runs/10795366695/job/29941873807#step:4:171 ARG FIREFLY_BUILDER_TAG ARG FABRIC_BUILDER_TAG ARG FABRIC_BUILDER_PLATFORM @@ -92,7 +92,7 @@ COPY --from=firefly-builder --chown=1001:0 /firefly/firefly ./firefly COPY --from=firefly-builder --chown=1001:0 /firefly/db ./db COPY --from=solidity-builder --chown=1001:0 /firefly/solidity_firefly/build/contracts ./contracts COPY --from=fabric-builder --chown=1001:0 /firefly/smart_contracts/fabric/firefly-go/firefly_fabric.tar.gz ./contracts/firefly_fabric.tar.gz -ENV UI_RELEASE=https://github.com/hyperledger/firefly-ui/releases/download/$UI_TAG/$UI_RELEASE.tgz +ENV UI_RELEASE=https://github.com/hyperledger-firefly/ui/releases/download/$UI_TAG/$UI_RELEASE.tgz RUN mkdir /firefly/frontend \ && curl -sLo - $UI_RELEASE | tar -C /firefly/frontend -zxvf - COPY --from=sbom /sbom.spdx.json /sbom.spdx.json diff --git a/Makefile b/Makefile index f411b91b4d..1fb5446704 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ ${MOCKERY}: ${LINT}: $(VGO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8 ffcommon: - $(eval WSCLIENT_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/hyperledger/firefly-common/pkg/wsclient)) + $(eval WSCLIENT_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/hyperledger-firefly/common/pkg/wsclient)) define makemock @@ -82,9 +82,9 @@ $(eval $(call makemock, internal/apiserver, Server, apiser $(eval $(call makemock, internal/events/websockets, WebSocketsNamespaced, websocketsmocks)) firefly-nocgo: ${GOFILES} - CGO_ENABLED=0 $(VGO) build -o ${BINARY_NAME}-nocgo -ldflags "-X main.buildDate=$(DATE) -X main.buildVersion=$(BUILD_VERSION) -X 'github.com/hyperledger/firefly/cmd.BuildVersionOverride=$(BUILD_VERSION)' -X 'github.com/hyperledger/firefly/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger/firefly/cmd.BuildCommit=$(GIT_REF)'" -tags=prod -tags=prod -v + CGO_ENABLED=0 $(VGO) build -o ${BINARY_NAME}-nocgo -ldflags "-X main.buildDate=$(DATE) -X main.buildVersion=$(BUILD_VERSION) -X 'github.com/hyperledger-firefly/firefly/cmd.BuildVersionOverride=$(BUILD_VERSION)' -X 'github.com/hyperledger-firefly/firefly/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger-firefly/firefly/cmd.BuildCommit=$(GIT_REF)'" -tags=prod -tags=prod -v firefly: ${GOFILES} - $(VGO) build -o ${BINARY_NAME} -ldflags "-X main.buildDate=$(DATE) -X main.buildVersion=$(BUILD_VERSION) -X 'github.com/hyperledger/firefly/cmd.BuildVersionOverride=$(BUILD_VERSION)' -X 'github.com/hyperledger/firefly/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger/firefly/cmd.BuildCommit=$(GIT_REF)'" -tags=prod -tags=prod -v + $(VGO) build -o ${BINARY_NAME} -ldflags "-X main.buildDate=$(DATE) -X main.buildVersion=$(BUILD_VERSION) -X 'github.com/hyperledger-firefly/firefly/cmd.BuildVersionOverride=$(BUILD_VERSION)' -X 'github.com/hyperledger-firefly/firefly/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger-firefly/firefly/cmd.BuildCommit=$(GIT_REF)'" -tags=prod -tags=prod -v go-mod-tidy: .ALWAYS $(VGO) mod tidy build: firefly-nocgo firefly diff --git a/README.md b/README.md index de4d8f5d8e..ea04d602b8 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Hyperledger FireFly -[![codecov](https://codecov.io/gh/hyperledger/firefly/branch/main/graph/badge.svg?token=QdEnpMqB1G)](https://codecov.io/gh/hyperledger/firefly) -[![Go Report Card](https://goreportcard.com/badge/github.com/hyperledger/firefly)](https://goreportcard.com/report/github.com/hyperledger/firefly) -[![FireFy Documentation](https://img.shields.io/static/v1?label=FireFly&message=documentation&color=informational)](https://hyperledger.github.io/firefly//) -![build](https://github.com/hyperledger/firefly/actions/workflows/docker_main.yml/badge.svg?branch=main) +[![codecov](https://codecov.io/gh/hyperledger-firefly/firefly/branch/main/graph/badge.svg?token=QdEnpMqB1G)](https://codecov.io/gh/hyperledger-firefly/firefly) +[![Go Report Card](https://goreportcard.com/badge/github.com/hyperledger-firefly/firefly)](https://goreportcard.com/report/github.com/hyperledger-firefly/firefly) +[![FireFy Documentation](https://img.shields.io/static/v1?label=FireFly&message=documentation&color=informational)](https://hyperledger-firefly.github.io/firefly//) +![build](https://github.com/hyperledger-firefly/firefly/actions/workflows/docker_main.yml/badge.svg?branch=main) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/7826/badge)](https://www.bestpractices.dev/projects/7826) -[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/hyperledger/firefly/badge)](https://scorecard.dev/viewer/?uri=github.com/hyperledger/firefly) +[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/hyperledger-firefly/firefly/badge)](https://scorecard.dev/viewer/?uri=github.com/hyperledger-firefly/firefly) ![Hyperledger FireFly](./images/hyperledger_firefly_logo.png) @@ -17,16 +17,16 @@ The FireFly API for digital assets, data flows, and blockchain transactions make ## Start using Hyperledger FireFly -The best place to learn about FireFly is in the [documentation](https://hyperledger.github.io/firefly). +The best place to learn about FireFly is in the [documentation](https://hyperledger-firefly.github.io/firefly). -There you will find our [Getting Started Guide](https://hyperledger.github.io/firefly/latest/gettingstarted/), +There you will find our [Getting Started Guide](https://hyperledger-firefly.github.io/firefly/latest/gettingstarted/), which will get you a running FireFly network of Supernodes on your local machine in a few minutes. Your development environment will come with: FireFly CLI | FireFly Explorer UI | FireFly Sandbox | :----------------------------:|:-----------------------------------:|:----------------:| -[![CLI](./images/firefly_cli.png)](https://hyperledger.github.io/firefly/latest/gettingstarted/firefly_cli/#install-the-firefly-cli) | [![UI](./images/firefly_explorer.png)](https://github.com/hyperledger/firefly-ui) | [![Sandbox](./images/firefly_sandbox.png)](https://hyperledger.github.io/firefly/latest/gettingstarted/sandbox/#use-the-sandbox) | +[![CLI](./images/firefly_cli.png)](https://hyperledger-firefly.github.io/firefly/latest/gettingstarted/firefly_cli/#install-the-firefly-cli) | [![UI](./images/firefly_explorer.png)](https://github.com/hyperledger-firefly/ui) | [![Sandbox](./images/firefly_sandbox.png)](https://hyperledger-firefly.github.io/firefly/latest/gettingstarted/sandbox/#use-the-sandbox) | ## Engage with the community @@ -47,7 +47,7 @@ all the plumbing for your blockchain application from scratch. There are lots of places you can contribute, regardless of whether your skills are front-end, backend-end, or full-stack. -Check out our [Contributor Guide](https://hyperledger.github.io/firefly/latest/contributors/), and **welcome!**. +Check out our [Contributor Guide](https://hyperledger-firefly.github.io/firefly/latest/contributors/), and **welcome!**. ## Other repos @@ -61,36 +61,36 @@ Other repositories you might be interested in containing those microservice comp ### Blockchain connectivity -- Transaction Manager - -- RLP & ABI encoding, KeystoreV3 utilities and secp256k1 signer runtime - -- FFCAPI reference connector for EVM Chains - - - Public EVM compatible chains: Learn more in the [documentation](https://hyperledger.github.io/firefly) -- Permissioned Ethereum connector - +- Transaction Manager - +- RLP & ABI encoding, KeystoreV3 utilities and secp256k1 signer runtime - +- FFCAPI reference connector for EVM Chains - + - Public EVM compatible chains: Learn more in the [documentation](https://hyperledger-firefly.github.io/firefly) +- Permissioned Ethereum connector - - Private/permissioned: Hyperledger Besu / Quorum -- Hyperledger Fabric connector - -- Tezos connector - -- Cardano connector - -- Corda connector starter: +- Hyperledger Fabric connector - +- Tezos connector - +- Cardano connector - +- Corda connector starter: - CorDapp specific customization is required ### Token standards -- Tokens ERC20/ERC721 - -- Tokens ERC1155 - +- Tokens ERC20/ERC721 - +- Tokens ERC1155 - ### Private data bus connectivity -- HTTPS Data Exchange - +- HTTPS Data Exchange - ### Developer ecosystem -- Command Line Interface (CLI) - -- Explorer UI - -- Node.js SDK - -- Sandbox / Exerciser - -- Samples - -- FireFly Performance CLI: -- Helm Charts for Deploying to Kubernetes: +- Command Line Interface (CLI) - +- Explorer UI - +- Node.js SDK - +- Sandbox / Exerciser - +- Samples - +- FireFly Performance CLI: +- Helm Charts for Deploying to Kubernetes: ## FireFly Core code hierarchy diff --git a/README_zh_CN.md b/README_zh_CN.md index 37d39e99a4..6b73d5b672 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -1,11 +1,11 @@ # Hyperledger FireFly -[![codecov](https://codecov.io/gh/hyperledger/firefly/branch/main/graph/badge.svg?token=QdEnpMqB1G)](https://codecov.io/gh/hyperledger/firefly) -[![Go Report Card](https://goreportcard.com/badge/github.com/hyperledger/firefly)](https://goreportcard.com/report/github.com/hyperledger/firefly) -[![FireFy Documentation](https://img.shields.io/static/v1?label=FireFly&message=documentation&color=informational)](https://hyperledger.github.io/firefly//) -![build](https://github.com/hyperledger/firefly/actions/workflows/docker_main.yml/badge.svg?branch=main) +[![codecov](https://codecov.io/gh/hyperledger-firefly/firefly/branch/main/graph/badge.svg?token=QdEnpMqB1G)](https://codecov.io/gh/hyperledger-firefly/firefly) +[![Go Report Card](https://goreportcard.com/badge/github.com/hyperledger-firefly/firefly)](https://goreportcard.com/report/github.com/hyperledger-firefly/firefly) +[![FireFy Documentation](https://img.shields.io/static/v1?label=FireFly&message=documentation&color=informational)](https://hyperledger-firefly.github.io/firefly//) +![build](https://github.com/hyperledger-firefly/firefly/actions/workflows/docker_main.yml/badge.svg?branch=main) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/7826/badge)](https://www.bestpractices.dev/projects/7826) -[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/hyperledger/firefly/badge)](https://scorecard.dev/viewer/?uri=github.com/hyperledger/firefly) +[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/hyperledger-firefly/firefly/badge)](https://scorecard.dev/viewer/?uri=github.com/hyperledger-firefly/firefly) ![Hyperledger FireFly](./images/hyperledger_firefly_logo.png) @@ -17,16 +17,16 @@ FireFly 提供的数字资产、数据流和区块链交易API，使企业能够 ## 开始使用 Hyperledger FireFly -了解FireFly的最佳方式请参照[文档](https://hyperledger.github.io/firefly)。 +了解FireFly的最佳方式请参照[文档](https://hyperledger-firefly.github.io/firefly)。 -您可以在这里找到我们的[入门指南](https://hyperledger.github.io/firefly/latest/gettingstarted/), +您可以在这里找到我们的[入门指南](https://hyperledger-firefly.github.io/firefly/latest/gettingstarted/), 通过该指南将帮助您在几分钟内在本地机器上运行起来一个FireFly超级节点网络的开发环境。 您的开发环境将包括: FireFly CLI | FireFly Explorer UI | FireFly Sandbox | :----------------------------:|:-----------------------------------:|:----------------:| -[![CLI](./images/firefly_cli.png)](https://hyperledger.github.io/firefly/latest/gettingstarted/firefly_cli/#install-the-firefly-cli) | [![UI](./images/firefly_explorer.png)](https://github.com/hyperledger/firefly-ui) | [![Sandbox](./images/firefly_sandbox.png)](https://hyperledger.github.io/firefly/latest/gettingstarted/sandbox/#use-the-sandbox) | +[![CLI](./images/firefly_cli.png)](https://hyperledger-firefly.github.io/firefly/latest/gettingstarted/firefly_cli/#install-the-firefly-cli) | [![UI](./images/firefly_explorer.png)](https://github.com/hyperledger-firefly/ui) | [![Sandbox](./images/firefly_sandbox.png)](https://hyperledger-firefly.github.io/firefly/latest/gettingstarted/sandbox/#use-the-sandbox) | ## 加入社区 @@ -44,7 +44,7 @@ Hyperledger FireFly 拥有可插拔的微服务架构。无论是区块链协议 无论您是前端、后端，还是全栈开发者，这里都有适合您的贡献机会。 -请查看我们的[贡献者指南](https://hyperledger.github.io/firefly/latest/contributors/)，**欢迎加入**！ +请查看我们的[贡献者指南](https://hyperledger-firefly.github.io/firefly/latest/contributors/)，**欢迎加入**！ ## 其他存储库 @@ -56,35 +56,35 @@ Hyperledger FireFly 拥有可插拔的微服务架构。无论是区块链协议 ### 区块链连接 -- Transaction Manager（区块链交易管理组件）- https://github.com/hyperledger/firefly-transaction-manager -- RLP & ABI 编码, Keystore V3实用工具 和 secp256k1 签名运行时 - https://github.com/hyperledger/firefly-signer -- 通用型以太坊区块链的参考连接器 - https://github.com/hyperledger/firefly-evmconnect - - EVM兼容公链: 请参见[文档](https://hyperledger.github.io/firefly) -- 针对许可制以太坊区块链的连接器 - https://github.com/hyperledger/firefly-ethconnect +- Transaction Manager（区块链交易管理组件）- https://github.com/hyperledger-firefly/transaction-manager +- RLP & ABI 编码, Keystore V3实用工具 和 secp256k1 签名运行时 - https://github.com/hyperledger-firefly/signer +- 通用型以太坊区块链的参考连接器 - https://github.com/hyperledger-firefly/evmconnect + - EVM兼容公链: 请参见[文档](https://hyperledger-firefly.github.io/firefly) +- 针对许可制以太坊区块链的连接器 - https://github.com/hyperledger-firefly/ethconnect - 私有/许可制区块链: Hyperledger Besu / Quorum -- Hyperledger Fabric连接器 - https://github.com/hyperledger/firefly-fabconnect -- Tezos连接器 - https://github.com/hyperledger/firefly-tezosconnect -- Corda连接器示例: https://github.com/hyperledger/firefly-cordaconnect +- Hyperledger Fabric连接器 - https://github.com/hyperledger-firefly/fabconnect +- Tezos连接器 - https://github.com/hyperledger-firefly/tezosconnect +- Corda连接器示例: https://github.com/hyperledger-firefly/cordaconnect - 使用该连接器，需要对 CorDapp 进行定制化开发 ### 代币标准 -- ERC20/ERC721 代币 - https://github.com/hyperledger/firefly-tokens-erc20-erc721 -- ERC1155 代币 - https://github.com/hyperledger/firefly-tokens-erc1155 +- ERC20/ERC721 代币 - https://github.com/hyperledger-firefly/tokens-erc20-erc721 +- ERC1155 代币 - https://github.com/hyperledger-firefly/tokens-erc1155 ### 私有数据总线连接 -- HTTPS 数据交换组件 - https://github.com/hyperledger/firefly-dataexchange-https +- HTTPS 数据交换组件 - https://github.com/hyperledger-firefly/dataexchange-https ### 开发者生态系统 -- 命令行界面 (CLI) - https://github.com/hyperledger/firefly-cli -- 图形用户界面 - https://github.com/hyperledger/firefly-ui -- Node.js SDK - https://github.com/hyperledger/firefly-sdk-nodejs -- 沙盒/测试工具 - https://github.com/hyperledger/firefly-sandbox -- 示例 - https://github.com/hyperledger/firefly-samples -- FireFly 性能测试 CLI: https://github.com/hyperledger/firefly-perf-cli -- 部署到Kubernetes的示例Helm Charts: https://github.com/hyperledger/firefly-helm-charts +- 命令行界面 (CLI) - https://github.com/hyperledger-firefly/cli +- 图形用户界面 - https://github.com/hyperledger-firefly/ui +- Node.js SDK - https://github.com/hyperledger-firefly/sdk-nodejs +- 沙盒/测试工具 - https://github.com/hyperledger-firefly/sandbox +- 示例 - https://github.com/hyperledger-firefly/samples +- FireFly 性能测试 CLI: https://github.com/hyperledger-firefly/perf-cli +- 部署到Kubernetes的示例Helm Charts: https://github.com/hyperledger-firefly/helm-charts ## FireFly 核心代码层级结构 diff --git a/auditevents/main.go b/auditevents/main.go index 41265f5ebe..c208faaf98 100644 --- a/auditevents/main.go +++ b/auditevents/main.go @@ -24,7 +24,7 @@ import ( "net/http" "os" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/spf13/cobra" ) diff --git a/cmd/firefly.go b/cmd/firefly.go index f1b09195a5..948eeb70dc 100644 --- a/cmd/firefly.go +++ b/cmd/firefly.go @@ -28,12 +28,12 @@ import ( "time" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/apiserver" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/namespace" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/apiserver" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/namespace" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/firefly_test.go b/cmd/firefly_test.go index e0aa3e9531..7856e5118c 100644 --- a/cmd/firefly_test.go +++ b/cmd/firefly_test.go @@ -23,8 +23,8 @@ import ( "syscall" "testing" - "github.com/hyperledger/firefly/mocks/apiservermocks" - "github.com/hyperledger/firefly/mocks/namespacemocks" + "github.com/hyperledger-firefly/firefly/mocks/apiservermocks" + "github.com/hyperledger-firefly/firefly/mocks/namespacemocks" "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/version.go b/cmd/version.go index 6d708dc860..b5925d330b 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -23,8 +23,8 @@ import ( "runtime/debug" "github.com/ghodss/yaml" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" "github.com/spf13/cobra" ) diff --git a/doc-site/config_docs_generate_test.go b/doc-site/config_docs_generate_test.go index 994162b88e..65129d1cff 100644 --- a/doc-site/config_docs_generate_test.go +++ b/doc-site/config_docs_generate_test.go @@ -25,10 +25,10 @@ import ( "path/filepath" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/internal/apiserver" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/namespace" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/internal/apiserver" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/namespace" "github.com/stretchr/testify/assert" ) diff --git a/doc-site/config_docs_test.go b/doc-site/config_docs_test.go index 80c0b0dbcd..87216656fe 100644 --- a/doc-site/config_docs_test.go +++ b/doc-site/config_docs_test.go @@ -26,10 +26,10 @@ import ( "path/filepath" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/internal/apiserver" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/namespace" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/internal/apiserver" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/namespace" "github.com/stretchr/testify/assert" ) diff --git a/doc-site/docs/architecture/blockchain_connector_framework.md b/doc-site/docs/architecture/blockchain_connector_framework.md index c9cab9ecd8..87e6d13e23 100644 --- a/doc-site/docs/architecture/blockchain_connector_framework.md +++ b/doc-site/docs/architecture/blockchain_connector_framework.md @@ -24,7 +24,7 @@ a set of re-usable modules that can be used across blockchain implementations. [![FireFly Blockchain Connector Toolkit Architecture](../images/firefly_transaction_manager.jpg)](../images/firefly_transaction_manager.jpg) The core component of the FireFly Connector Framework for Blockchains is a Go module -called [FireFly Transaction Manager](https://github.com/hyperledger/firefly-transaction-manager) (FFTM). +called [FireFly Transaction Manager](https://github.com/hyperledger-firefly/transaction-manager) (FFTM). FFTM is responsible for: @@ -108,7 +108,7 @@ multiple simple web/mobile wallets used against the same key), but it does not e ### Why "at source" nonce management was chosen vs. "at target" The "at source" approach to ordering used in FFTM could be compared with the "at target" allocation of nonces used in -[EthConnect](https://github.com/hyperledger/firefly-ethconnect)). +[EthConnect](https://github.com/hyperledger-firefly/ethconnect)). The "at target" approach optimizes for throughput and ability to send new transactions to the chain, with an at-least-once delivery assurance to the applications. @@ -143,7 +143,7 @@ A reference implementation is provided that: - Record detailed information about [transaction sub-status and actions](../reference/blockchain_operation_status.md) - Emit customized metrics for transaction processing -The reference implementation is available [here](https://github.com/hyperledger/firefly-transaction-manager/blob/main/pkg/txhandler/simple/simple_transaction_handler.go) +The reference implementation is available [here](https://github.com/hyperledger-firefly/transaction-manager/blob/main/pkg/txhandler/simple/simple_transaction_handler.go) ## Event Streams diff --git a/doc-site/docs/architecture/node_component_architecture.md b/doc-site/docs/architecture/node_component_architecture.md index 413f027c14..e80b496ad5 100644 --- a/doc-site/docs/architecture/node_component_architecture.md +++ b/doc-site/docs/architecture/node_component_architecture.md @@ -46,6 +46,6 @@ What are the core runtime responsibilities, and pluggable elements - right side What is the code structure _inside_ the core. -- The [README.md](https://github.com/hyperledger/firefly#readme) is the reference for this. +- The [README.md](https://github.com/hyperledger-firefly/firefly#readme) is the reference for this. - Developers contributing to FireFly, on the core, or building new plugins, need this level of detail. > - A reconciliation is underway to ensure the medium-level view correlates well with this code structure. diff --git a/doc-site/docs/contributors/advanced_cli_usage.md b/doc-site/docs/contributors/advanced_cli_usage.md index bb52d7dbd7..b325286e00 100644 --- a/doc-site/docs/contributors/advanced_cli_usage.md +++ b/doc-site/docs/contributors/advanced_cli_usage.md @@ -8,29 +8,29 @@ This page details some of the more advanced options of the FireFly CLI ## The `manifest.json` file -FireFly has a [`manifest.json` file in the root of the repo](https://github.com/hyperledger/firefly/blob/main/manifest.json). This file contains a list of versions (both tag and sha) for each of the microservices that should be used with this specific commit. +FireFly has a [`manifest.json` file in the root of the repo](https://github.com/hyperledger-firefly/firefly/blob/main/manifest.json). This file contains a list of versions (both tag and sha) for each of the microservices that should be used with this specific commit. Here is an example of what the `manifest.json` looks like: ```json { "ethconnect": { - "image": "ghcr.io/hyperledger/firefly-ethconnect", + "image": "ghcr.io/hyperledger-firefly/ethconnect", "tag": "v3.0.4", "sha": "0b7ce0fb175b5910f401ff576ced809fe6f0b83894277c1cc86a73a2d61c6f41" }, "fabconnect": { - "image": "ghcr.io/hyperledger/firefly-fabconnect", + "image": "ghcr.io/hyperledger-firefly/fabconnect", "tag": "v0.9.0", "sha": "a79a4c66b0a2551d5122d019c15c6426e8cdadd6566ce3cbcb36e008fb7861ca" }, "dataexchange-https": { - "image": "ghcr.io/hyperledger/firefly-dataexchange-https", + "image": "ghcr.io/hyperledger-firefly/dataexchange-https", "tag": "v0.9.0", "sha": "0de5b1db891a02871505ba5e0507821416d9fa93c96ccb4b1ba2fac45eb37214" }, "tokens-erc1155": { - "image": "ghcr.io/hyperledger/firefly-tokens-erc1155", + "image": "ghcr.io/hyperledger-firefly/tokens-erc1155", "tag": "v0.9.0-20211019-01", "sha": "aabc6c483db408896838329dab5f4b9e3c16d1e9fa9fffdb7e1ff05b7b2bbdd4" } @@ -64,7 +64,7 @@ If you need to test a locally built docker image of a specific service, you'll w From the fabconnect project directory, build and tag a new Docker image: ``` -docker build -t ghcr.io/hyperledger/firefly-fabconnect . +docker build -t ghcr.io/hyperledger-firefly/fabconnect . ``` ### Edit your `manifest.json` file @@ -74,7 +74,7 @@ Next, edit the `fabconnect` section of the `manifest.json` file. You'll want to ```json ... "fabconnect": { - "image": "ghcr.io/hyperledger/firefly-fabconnect", + "image": "ghcr.io/hyperledger-firefly/fabconnect", "local": true }, ... @@ -83,7 +83,7 @@ Next, edit the `fabconnect` section of the `manifest.json` file. You'll want to ### Initialize the stack with the custom `manifest.json` file ``` - ff init local-test -b fabric -m ~/Code/hyperledger/firefly/manifest.json + ff init local-test -b fabric -m ~/Code/hyperledger-firefly/firefly/manifest.json ff start local-test ``` @@ -107,6 +107,6 @@ make docker ### Initialize the stack with the custom `manifest.json` file ``` - ff init local-test -m ~/Code/hyperledger/firefly/manifest.json + ff init local-test -m ~/Code/hyperledger-firefly/firefly/manifest.json ff start local-test ``` diff --git a/doc-site/docs/contributors/code_overview.md b/doc-site/docs/contributors/code_overview.md index 73e0d9d9d5..49853ffc85 100644 --- a/doc-site/docs/contributors/code_overview.md +++ b/doc-site/docs/contributors/code_overview.md @@ -38,7 +38,7 @@ A few highlights: ## Directories -- [internal](https://github.com/hyperledger/firefly/tree/main/internal): The core Golang implementation code -- [pkg](https://github.com/hyperledger/firefly/tree/main/pkg): Interfaces intended for external project use -- [cmd](https://github.com/hyperledger/firefly/tree/main/cmd): The command line entry point -- [smart_contracts](https://github.com/hyperledger/firefly/tree/main/smart_contracts): smart contract code for FireFly's onchain logic +- [internal](https://github.com/hyperledger-firefly/firefly/tree/main/internal): The core Golang implementation code +- [pkg](https://github.com/hyperledger-firefly/firefly/tree/main/pkg): Interfaces intended for external project use +- [cmd](https://github.com/hyperledger-firefly/firefly/tree/main/cmd): The command line entry point +- [smart_contracts](https://github.com/hyperledger-firefly/firefly/tree/main/smart_contracts): smart contract code for FireFly's onchain logic diff --git a/doc-site/docs/contributors/code_repositories.md b/doc-site/docs/contributors/code_repositories.md index 4ccd302a71..3bed1a9c53 100644 --- a/doc-site/docs/contributors/code_repositories.md +++ b/doc-site/docs/contributors/code_repositories.md @@ -7,15 +7,15 @@ As such there are a number of repos, and the list will grow as the community evo But not to worry, one of those repos is a CLI designed to get you running with all the components you need in minutes! -- [CLI / Developer experience](https://github.com/hyperledger/firefly-cli) -- [FireFly Samples](https://github.com/hyperledger/firefly-samples) -- [UI Explorer](https://github.com/hyperledger/firefly-ui) -- [Core](https://github.com/hyperledger/firefly) -- [HTTP Data Exchange](https://github.com/hyperledger/firefly-dataexchange-https) -- [Ethereum (Hyperledger Besu / Quorum) connector](https://github.com/hyperledger/firefly-ethconnect) -- [Corda connector](https://github.com/hyperledger/firefly-cordaconnect) -- [Hyperledger Fabric connector](https://github.com/hyperledger/firefly-fabconnect) -- [Token connector reference implementation (ERC1155)](https://github.com/hyperledger/firefly-tokens-erc1155) +- [CLI / Developer experience](https://github.com/hyperledger-firefly/cli) +- [FireFly Samples](https://github.com/hyperledger-firefly/samples) +- [UI Explorer](https://github.com/hyperledger-firefly/ui) +- [Core](https://github.com/hyperledger-firefly/firefly) +- [HTTP Data Exchange](https://github.com/hyperledger-firefly/dataexchange-https) +- [Ethereum (Hyperledger Besu / Quorum) connector](https://github.com/hyperledger-firefly/ethconnect) +- [Corda connector](https://github.com/hyperledger-firefly/cordaconnect) +- [Hyperledger Fabric connector](https://github.com/hyperledger-firefly/fabconnect) +- [Token connector reference implementation (ERC1155)](https://github.com/hyperledger-firefly/tokens-erc1155) > Note only the projects that are primarily built to support FireFly are listed here, not all > of the ecosystem of projects that integrate underneath the plugins. diff --git a/doc-site/docs/contributors/dev_environment_setup.md b/doc-site/docs/contributors/dev_environment_setup.md index 850d91c0e5..250014476a 100644 --- a/doc-site/docs/contributors/dev_environment_setup.md +++ b/doc-site/docs/contributors/dev_environment_setup.md @@ -40,7 +40,7 @@ export PATH="$PATH:${GOPATH}/bin:${GOROOT}/bin" After installing dependencies, building FireFly from source is very easy. Just clone the repo: ``` -git clone git@github.com:hyperledger/firefly.git && cd firefly +git clone git@github.com:hyperledger-firefly/firefly.git && cd firefly ``` And run the `Makefile` to run tests, and compile the app @@ -58,7 +58,7 @@ go install ## Install the CLI Please check the CLI Installation instructions for the best way to install the CLI on your machine: -https://github.com/hyperledger/firefly-cli#install-the-cli +https://github.com/hyperledger-firefly/cli#install-the-cli ## Set up a development stack diff --git a/doc-site/docs/contributors/docs_setup.md b/doc-site/docs/contributors/docs_setup.md index 0236b5c7db..996fb054a9 100644 --- a/doc-site/docs/contributors/docs_setup.md +++ b/doc-site/docs/contributors/docs_setup.md @@ -6,7 +6,7 @@ title: Contributing to Documentation This guide will walk you through setting up your machine for contributing to FireFly documentation. Documentation contributions are extremely valuable. If you discover something is missing in the docs, we would love to include your additions or clarifications to help the next person who has the same question. -This doc site is generated by a set of [Markdown](https://daringfireball.net/projects/markdown/) files in the main FireFly repository, under the `./doc-site` directory. You can browse the source for the current live site in GitHub here: [https://github.com/hyperledger/firefly/tree/main/doc-site](https://github.com/hyperledger/firefly/tree/main/doc-site) +This doc site is generated by a set of [Markdown](https://daringfireball.net/projects/markdown/) files in the main FireFly repository, under the `./doc-site` directory. You can browse the source for the current live site in GitHub here: [https://github.com/hyperledger-firefly/firefly/tree/main/doc-site](https://github.com/hyperledger-firefly/firefly/tree/main/doc-site) --- @@ -14,14 +14,14 @@ This doc site is generated by a set of [Markdown](https://daringfireball.net/pro The process for updating the documentation is really easy! You'll follow the same basic steps outlined in the same [steps outlined in the Contributor's guide](./index.md#-make-changes). Here are the detailed steps for contributing to the docs: -1. Fork [https://github.com/hyperledger/firefly](https://github.com/hyperledger/firefly) +1. Fork [https://github.com/hyperledger-firefly/firefly](https://github.com/hyperledger-firefly/firefly) 2. Clone your fork locally to your computer 3. Follow the steps below to view your local copy of the docs in a browser 4. Make some improvements to the Markdown files 5. Verify that your changes look they way you want them to in your browser 6. Create a new git commit with your changes. Be sure to sign-off on your commit by using `git commit -s`! 7. Push your changes -8. [Open a Pull Request](https://github.com/hyperledger/firefly/compare) to incorporate your changes back into the hyperledger/firefly repo +8. [Open a Pull Request](https://github.com/hyperledger-firefly/firefly/compare) to incorporate your changes back into the hyperledger-firefly/firefly repo --- diff --git a/doc-site/docs/contributors/index.md b/doc-site/docs/contributors/index.md index 0f5d0f5fe4..a8bc09c87c 100644 --- a/doc-site/docs/contributors/index.md +++ b/doc-site/docs/contributors/index.md @@ -33,31 +33,31 @@ Here are some other suggestions of places to get started, based on experience yo ### Any level of experience -If you looking to make your first open source contribution the [FireFly documentation](https://github.com/hyperledger/firefly/tree/main/docs) is a great place to make small, easy improvements. These improvements are also very valuable, because they help the next person that may want to know the same thing. +If you looking to make your first open source contribution the [FireFly documentation](https://github.com/hyperledger-firefly/firefly/tree/main/docs) is a great place to make small, easy improvements. These improvements are also very valuable, because they help the next person that may want to know the same thing. Here are some detailed instructions on [Contributing to Documentation](./docs_setup.md) ### Go experience -If you have some experience in Go and really want to jump into FireFly, the [FireFly Core](https://github.com/hyperledger/firefly/issues) is the heart of the project. +If you have some experience in Go and really want to jump into FireFly, the [FireFly Core](https://github.com/hyperledger-firefly/firefly/issues) is the heart of the project. Here are some detailed instructions on [Setting up a FireFly Core Development Environment](./dev_environment_setup.md). ### Little or no Go experience, but want to learn -If you don't have a lot of experience with Go, but are interested in learning, the [FireFly CLI](https://github.com/hyperledger/firefly-cli/issues) might be a good place to start. The FireFly CLI is a tool to set up local instances of FireFly for building apps that use FireFly, and for doing development on FireFly itself. +If you don't have a lot of experience with Go, but are interested in learning, the [FireFly CLI](https://github.com/hyperledger-firefly/cli/issues) might be a good place to start. The FireFly CLI is a tool to set up local instances of FireFly for building apps that use FireFly, and for doing development on FireFly itself. ### TypeScript experience -If you have some experience in TypeScript, there are several FireFly microservices that are written in TypeScript. The [Data Exchange](https://github.com/hyperledger/firefly-dataexchange-https/issues) is used for private messaging between FireFly nodes. The [ERC-20/ERC-271 Tokens Connector](https://github.com/hyperledger/firefly-tokens-erc20-erc721/issues) and [ERC-1155 Tokens Connector](https://github.com/hyperledger/firefly-tokens-erc1155/issues) are used to abstract token contract specifics from the FireFly Core. +If you have some experience in TypeScript, there are several FireFly microservices that are written in TypeScript. The [Data Exchange](https://github.com/hyperledger-firefly/dataexchange-https/issues) is used for private messaging between FireFly nodes. The [ERC-20/ERC-271 Tokens Connector](https://github.com/hyperledger-firefly/tokens-erc20-erc721/issues) and [ERC-1155 Tokens Connector](https://github.com/hyperledger-firefly/tokens-erc1155/issues) are used to abstract token contract specifics from the FireFly Core. ### React/TypeScript experience -If you want to do some frontend development, the [FireFly UI](https://github.com/hyperledger/firefly-ui/issues) is written in TypeScript and React. +If you want to do some frontend development, the [FireFly UI](https://github.com/hyperledger-firefly/ui/issues) is written in TypeScript and React. ### Go and blockchain experience -If you already have some experience with blockchain and want to work on some backend components, the blockchain connectors, [firefly-ethconnect](https://github.com/hyperledger/firefly-ethconnect/issues) (for Ethereum) and [firefly-fabconnect](https://github.com/hyperledger/firefly-fabconnect/issues) (for Fabric) are great places to get involved. +If you already have some experience with blockchain and want to work on some backend components, the blockchain connectors, [firefly-ethconnect](https://github.com/hyperledger-firefly/ethconnect/issues) (for Ethereum) and [firefly-fabconnect](https://github.com/hyperledger-firefly/fabconnect/issues) (for Fabric) are great places to get involved. ## 📝 Make changes diff --git a/doc-site/docs/contributors/release_guide.md b/doc-site/docs/contributors/release_guide.md index f143512750..280addb8bb 100644 --- a/doc-site/docs/contributors/release_guide.md +++ b/doc-site/docs/contributors/release_guide.md @@ -14,29 +14,29 @@ FireFly follows semantic versioning. For more details on how we determine which ## The `manifest.json` file -FireFly has a [`manifest.json` file in the root of the repo](https://github.com/hyperledger/firefly/blob/main/manifest.json). This file contains a list of versions (both tag and sha) for each of the microservices that should be used with this specific commit. If you need FireFly to use a newer version of a microservice listed in this file, you should update the `manifest.json` file, commit it, and include it in your PR. **This will trigger an end-to-end test run, using the specified versions.** +FireFly has a [`manifest.json` file in the root of the repo](https://github.com/hyperledger-firefly/firefly/blob/main/manifest.json). This file contains a list of versions (both tag and sha) for each of the microservices that should be used with this specific commit. If you need FireFly to use a newer version of a microservice listed in this file, you should update the `manifest.json` file, commit it, and include it in your PR. **This will trigger an end-to-end test run, using the specified versions.** Here is an example of what the `manifest.json` looks like: ```json { "ethconnect": { - "image": "ghcr.io/hyperledger/firefly-ethconnect", + "image": "ghcr.io/hyperledger-firefly/ethconnect", "tag": "v3.0.4", "sha": "0b7ce0fb175b5910f401ff576ced809fe6f0b83894277c1cc86a73a2d61c6f41" }, "fabconnect": { - "image": "ghcr.io/hyperledger/firefly-fabconnect", + "image": "ghcr.io/hyperledger-firefly/fabconnect", "tag": "v0.9.0", "sha": "a79a4c66b0a2551d5122d019c15c6426e8cdadd6566ce3cbcb36e008fb7861ca" }, "dataexchange-https": { - "image": "ghcr.io/hyperledger/firefly-dataexchange-https", + "image": "ghcr.io/hyperledger-firefly/dataexchange-https", "tag": "v0.9.0", "sha": "0de5b1db891a02871505ba5e0507821416d9fa93c96ccb4b1ba2fac45eb37214" }, "tokens-erc1155": { - "image": "ghcr.io/hyperledger/firefly-tokens-erc1155", + "image": "ghcr.io/hyperledger-firefly/tokens-erc1155", "tag": "v0.9.0-20211019-01", "sha": "aabc6c483db408896838329dab5f4b9e3c16d1e9fa9fffdb7e1ff05b7b2bbdd4" } diff --git a/doc-site/docs/gettingstarted/firefly_cli.md b/doc-site/docs/gettingstarted/firefly_cli.md index bb26fd574c..7afeefc70a 100644 --- a/doc-site/docs/gettingstarted/firefly_cli.md +++ b/doc-site/docs/gettingstarted/firefly_cli.md @@ -26,7 +26,7 @@ There are several ways to install the FireFly CLI. The easiest way to get up and ### Install via Binary Package Download -Download the package for your OS by navigating to the [latest release page](https://github.com/hyperledger/firefly-cli/releases/latest) and downloading the appropriate package for your OS and architecture. +Download the package for your OS by navigating to the [latest release page](https://github.com/hyperledger-firefly/cli/releases/latest) and downloading the appropriate package for your OS and architecture. #### Unpack and Install the Binary @@ -42,7 +42,7 @@ If you downloaded the package into a different directory, adjust the command to #### macOSUsers -> **NOTE**: On recent versions of macOS, default security settings will prevent the FireFly CLI binary from running, because it was downloaded from the internet. You will need to [allow the FireFly CLI in System Preferences](https://github.com/hyperledger/firefly-cli/blob/main/docs/mac_help.md), before it will run. +> **NOTE**: On recent versions of macOS, default security settings will prevent the FireFly CLI binary from running, because it was downloaded from the internet. You will need to [allow the FireFly CLI in System Preferences](https://github.com/hyperledger-firefly/cli/blob/main/docs/mac_help.md), before it will run. ### Install via Homebrew (macOS) @@ -57,7 +57,7 @@ brew install firefly If you have a local Go development environment, and you have included `${GOPATH}/bin` in your path, you could also use Go to install the FireFly CLI by running: ```sh -go install github.com/hyperledger/firefly-cli/ff@latest +go install github.com/hyperledger-firefly/cli/ff@latest ``` ## Verify the installation diff --git a/doc-site/docs/overview/gateway_features.md b/doc-site/docs/overview/gateway_features.md index 8d9bc1f2e1..3ef07c97d9 100644 --- a/doc-site/docs/overview/gateway_features.md +++ b/doc-site/docs/overview/gateway_features.md @@ -36,7 +36,7 @@ and you can use Hyperledger FireFly as a high volume staging post for those tran - Idempotent APIs assuring that business transactions are submitted exactly once > For EVM based chains, these features were significantly enhanced in the new EVMConnect -> connector introduced in v1.1 of FireFly (superseding [EthConnect](https://github.com/hyperledger/firefly-ethconnect)). +> connector introduced in v1.1 of FireFly (superseding [EthConnect](https://github.com/hyperledger-firefly/ethconnect)). ## Index data from the blockchain diff --git a/doc-site/docs/overview/key_components/security.md b/doc-site/docs/overview/key_components/security.md index 50143de474..f905be26de 100644 --- a/doc-site/docs/overview/key_components/security.md +++ b/doc-site/docs/overview/key_components/security.md @@ -17,7 +17,7 @@ verification of passwords with a `bcrypt` encoding. [See this config section for details](../../reference/config.md#pluginsauth), and the reference implementation -[in Github](https://github.com/hyperledger/firefly-common/blob/main/pkg/auth/basic/basic_auth.go) +[in Github](https://github.com/hyperledger-firefly/common/blob/main/pkg/auth/basic/basic_auth.go) > Pre-packaged vendor extensions to Hyperledger FireFly are known to be available, addressing more > comprehensive role-based access control (RBAC) and JWT/OAuth based security models. @@ -44,7 +44,7 @@ A reference microservice implementation is provided for HTTPS point-to-point con mutual TLS encryption. See the reference implementation -[in Github](https://github.com/hyperledger/firefly-dataexchange-https) +[in Github](https://github.com/hyperledger-firefly/dataexchange-https) > Pre-packaged vendor extensions to Hyperledger FireFly are known to be available, addressing > message queue based reliable delivery of messages, hub-and-spoke connectivity models, chunking diff --git a/doc-site/docs/overview/multiparty/data_exchange.md b/doc-site/docs/overview/multiparty/data_exchange.md index 189dd7da68..0467392868 100644 --- a/doc-site/docs/overview/multiparty/data_exchange.md +++ b/doc-site/docs/overview/multiparty/data_exchange.md @@ -65,4 +65,4 @@ backed by Mutual TLS authentication. X509 certificate exchange is orchestrated b such that self-signed certificates can be used (or multiple PKI trust roots) and bound to the blockchain-backed identities of the organizations in FireFly. -See [hyperledger/firefly-dataexchange-https](https://github.com/hyperledger/firefly-dataexchange-https) +See [hyperledger-firefly/dataexchange-https](https://github.com/hyperledger-firefly/dataexchange-https) diff --git a/doc-site/docs/overview/public_vs_permissioned.md b/doc-site/docs/overview/public_vs_permissioned.md index 6a3182f3fd..47361d627f 100644 --- a/doc-site/docs/overview/public_vs_permissioned.md +++ b/doc-site/docs/overview/public_vs_permissioned.md @@ -63,7 +63,7 @@ is also a factor in the behavior of the transaction submission and event streami One of the fastest evolving aspects of the Hyperledger FireFly ecosystem, is how it facilitates enterprises to participate in these. -[![FireFly Public Transaction Architecture](../images/firefly_transaction_manager.jpg)](https://github.com/hyperledger/firefly-transaction-manager) +[![FireFly Public Transaction Architecture](../images/firefly_transaction_manager.jpg)](https://github.com/hyperledger-firefly/transaction-manager) The architecture is summarized as follows: @@ -97,7 +97,7 @@ The architecture is summarized as follows: - WebSockets interface upstream to FireFly Core This evolution involves a significant refactoring of components used for production solutions in the FireFly Ethconnect -microservice since mid 2018. This was summarized in [firefly-ethconnect#149](https://github.com/hyperledger/firefly-ethconnect/issues/149), +microservice since mid 2018. This was summarized in [firefly-ethconnect#149](https://github.com/hyperledger-firefly/ethconnect/issues/149), and cumulated in the creation of a new repository in 2022. -You can follow the progress and contribute in this repo: https://github.com/hyperledger/firefly-transaction-manager +You can follow the progress and contribute in this repo: https://github.com/hyperledger-firefly/transaction-manager diff --git a/doc-site/docs/reference/blockchain_operation_errors.md b/doc-site/docs/reference/blockchain_operation_errors.md index a3d5afca5e..c7ab6369f3 100644 --- a/doc-site/docs/reference/blockchain_operation_errors.md +++ b/doc-site/docs/reference/blockchain_operation_errors.md @@ -39,7 +39,7 @@ If the smart contract uses a custom error type, Besu will return the revert reas - `"errorMessage":"FF23053: Error return value for custom error: ` - `"returnValue":""` -A future update to FireFly could be made to automatically decode custom error revert reasons if FireFly knows the ABI for the custom error. See [FireFly issue 1466](https://github.com/hyperledger/firefly/issues/1466) which describes the current limitation. +A future update to FireFly could be made to automatically decode custom error revert reasons if FireFly knows the ABI for the custom error. See [FireFly issue 1466](https://github.com/hyperledger-firefly/firefly/issues/1466) which describes the current limitation. If FireFly is configured to connect to Besu without `revert-reason-enabled=true` the error message will be set to: diff --git a/doc-site/docs/reference/config.md b/doc-site/docs/reference/config.md index be00252d34..283fdf09e3 100644 --- a/doc-site/docs/reference/config.md +++ b/doc-site/docs/reference/config.md @@ -276,6 +276,19 @@ title: Configuration Reference |password|Password|`string`|`` |username|Username|`string`|`` +## events.webhooks.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## events.webhooks.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## events.webhooks.proxy |Key|Description|Type|Default Value| @@ -662,6 +675,19 @@ title: Configuration Reference |password|Password|`string`|`` |username|Username|`string`|`` +## plugins.blockchain[].cardano.cardanoconnect.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## plugins.blockchain[].cardano.cardanoconnect.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.blockchain[].cardano.cardanoconnect.proxy |Key|Description|Type|Default Value| @@ -743,6 +769,19 @@ title: Configuration Reference |password|Password|`string`|`` |username|Username|`string`|`` +## plugins.blockchain[].ethereum.addressResolver.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## plugins.blockchain[].ethereum.addressResolver.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.blockchain[].ethereum.addressResolver.proxy |Key|Description|Type|Default Value| @@ -820,6 +859,19 @@ title: Configuration Reference |initialDelay|Delay between restarts in the case where we retry to restart the ethereum plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`5s` |maxDelay|Max delay between restarts in the case where we retry to restart the ethereum plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`1m` +## plugins.blockchain[].ethereum.ethconnect.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## plugins.blockchain[].ethereum.ethconnect.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.blockchain[].ethereum.ethconnect.proxy |Key|Description|Type|Default Value| @@ -895,6 +947,19 @@ title: Configuration Reference |password|Password|`string`|`` |username|Username|`string`|`` +## plugins.blockchain[].ethereum.fftm.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## plugins.blockchain[].ethereum.fftm.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.blockchain[].ethereum.fftm.proxy |Key|Description|Type|Default Value| @@ -973,6 +1038,19 @@ title: Configuration Reference |initialDelay|Delay between restarts in the case where we retry to restart the fabric plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`5s` |maxDelay|Max delay between restarts in the case where we retry to restart the fabric plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`1m` +## plugins.blockchain[].fabric.fabconnect.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## plugins.blockchain[].fabric.fabconnect.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.blockchain[].fabric.fabconnect.proxy |Key|Description|Type|Default Value| @@ -1054,6 +1132,19 @@ title: Configuration Reference |password|Password|`string`|`` |username|Username|`string`|`` +## plugins.blockchain[].tezos.addressResolver.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## plugins.blockchain[].tezos.addressResolver.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.blockchain[].tezos.addressResolver.proxy |Key|Description|Type|Default Value| @@ -1129,6 +1220,19 @@ title: Configuration Reference |initialDelay|Delay between restarts in the case where we retry to restart the tezos plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`5s` |maxDelay|Max delay between restarts in the case where we retry to restart the tezos plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`1m` +## plugins.blockchain[].tezos.tezosconnect.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## plugins.blockchain[].tezos.tezosconnect.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.blockchain[].tezos.tezosconnect.proxy |Key|Description|Type|Default Value| @@ -1263,6 +1367,13 @@ title: Configuration Reference |initialDelay|Delay between restarts in the case where we retry to restart the data exchange plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`5s` |maxDelay|Max delay between restarts in the case where we retry to restart the data exchange plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`1m` +## plugins.dataexchange[].ffdx.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + ## plugins.dataexchange[].ffdx.eventRetry |Key|Description|Type|Default Value| @@ -1271,6 +1382,12 @@ title: Configuration Reference |initialDelay|The initial retry delay, for event processing|[`time.Duration`](https://pkg.go.dev/time#Duration)|`50ms` |maxDelay|The maximum retry delay, for event processing|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s` +## plugins.dataexchange[].ffdx.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.dataexchange[].ffdx.proxy |Key|Description|Type|Default Value| @@ -1360,6 +1477,19 @@ title: Configuration Reference |password|Password|`string`|`` |username|Username|`string`|`` +## plugins.sharedstorage[].ipfs.api.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## plugins.sharedstorage[].ipfs.api.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.sharedstorage[].ipfs.api.proxy |Key|Description|Type|Default Value| @@ -1421,6 +1551,19 @@ title: Configuration Reference |password|Password|`string`|`` |username|Username|`string`|`` +## plugins.sharedstorage[].ipfs.gateway.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + +## plugins.sharedstorage[].ipfs.gateway.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.sharedstorage[].ipfs.gateway.proxy |Key|Description|Type|Default Value| @@ -1499,6 +1642,13 @@ title: Configuration Reference |initialDelay|Delay between restarts in the case where we retry to restart the token plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`5s` |maxDelay|Max delay between restarts in the case where we retry to restart the token plugin|[`time.Duration`](https://pkg.go.dev/time#Duration)|`1m` +## plugins.tokens[].fftokens.dns + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|servers|An optional list of DNS server addresses (host or host:port, port defaults to 53) to use instead of the system resolver. Setting this forces use of Go's built-in DNS resolver.|`[]string`|`` +|timeout|The dial timeout when contacting a configured DNS server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`` + ## plugins.tokens[].fftokens.eventRetry |Key|Description|Type|Default Value| @@ -1507,6 +1657,12 @@ title: Configuration Reference |initialDelay|The initial retry delay, for event processing|[`time.Duration`](https://pkg.go.dev/time#Duration)|`50ms` |maxDelay|The maximum retry delay, for event processing|[`time.Duration`](https://pkg.go.dev/time#Duration)|`30s` +## plugins.tokens[].fftokens.net + +|Key|Description|Type|Default Value| +|---|-----------|----|-------------| +|cidrDenylist|A list of CIDR ranges to which outbound connections are blocked, as a core SSRF mitigation. Empty by default.|`[]string`|`` + ## plugins.tokens[].fftokens.proxy |Key|Description|Type|Default Value| diff --git a/doc-site/docs/reference/microservices/fftokens.md b/doc-site/docs/reference/microservices/fftokens.md index fce23e9cc0..6d685c29db 100644 --- a/doc-site/docs/reference/microservices/fftokens.md +++ b/doc-site/docs/reference/microservices/fftokens.md @@ -6,7 +6,7 @@ title: fftokens ## Overview -fftokens is a protocol that can be implemented by token connector runtimes in order to be usable by the [fftokens](https://github.com/hyperledger/firefly/blob/main/internal/tokens/fftokens/fftokens.go) plugin in FireFly. +fftokens is a protocol that can be implemented by token connector runtimes in order to be usable by the [fftokens](https://github.com/hyperledger-firefly/firefly/blob/main/internal/tokens/fftokens/fftokens.go) plugin in FireFly. The connector runtime must expose an **HTTP and websocket server**, along with a minimum set of HTTP APIs and websocket events. Each connector will be strongly coupled to a specific ledger technology and token standard(s), but **no assumptions are made** in the fftokens spec about what these technologies must be, as long as they can satisfy the basic requirements laid out here. @@ -14,7 +14,7 @@ Note that this is an _internal_ protocol in the FireFly ecosystem - application interact with a token connector runtime. The audience for this document is only developers interested in creating new token connectors (or editing/forking existing ones). -Two implementations of this specification have been created to date (both based on common Ethereum token standards) - [firefly-tokens-erc1155](https://github.com/hyperledger/firefly-tokens-erc1155) and [firefly-tokens-erc20-erc721](https://github.com/hyperledger/firefly-tokens-erc20-erc721). +Two implementations of this specification have been created to date (both based on common Ethereum token standards) - [firefly-tokens-erc1155](https://github.com/hyperledger-firefly/tokens-erc1155) and [firefly-tokens-erc20-erc721](https://github.com/hyperledger-firefly/tokens-erc20-erc721). ## HTTP APIs diff --git a/doc-site/docs/reference/types/_includes/identity_description.md b/doc-site/docs/reference/types/_includes/identity_description.md index 8cedcb04d6..1c13725b07 100644 --- a/doc-site/docs/reference/types/_includes/identity_description.md +++ b/doc-site/docs/reference/types/_includes/identity_description.md @@ -1,7 +1,7 @@ FireFly contains an address book of identities, which is managed in a decentralized way across a multi-party system through `claim` and `verification` system. -> See [FIR-12](https://github.com/hyperledger/firefly-fir/pull/12) for evolution +> See [FIR-12](https://github.com/hyperledger-firefly/fir/pull/12) for evolution > that is happening to Hyperledger FireFly to allow: > > - Private address books that are not shared with other participants diff --git a/doc-site/docs/reference/types/_includes/namespace_description.md b/doc-site/docs/reference/types/_includes/namespace_description.md index 7725f17fc1..5d4b903859 100644 --- a/doc-site/docs/reference/types/_includes/namespace_description.md +++ b/doc-site/docs/reference/types/_includes/namespace_description.md @@ -2,4 +2,4 @@ A namespace is a logical isolation domain for different applications, or tenants FireFly node. > Significant evolution of the Hyperledger FireFly namespace construct, is proposed under -> [FIR-12](https://github.com/hyperledger/firefly-fir/pull/12) +> [FIR-12](https://github.com/hyperledger-firefly/fir/pull/12) diff --git a/doc-site/docs/reference/types/_includes/subscription_description.md b/doc-site/docs/reference/types/_includes/subscription_description.md index db2dab4056..b83a74a1ab 100644 --- a/doc-site/docs/reference/types/_includes/subscription_description.md +++ b/doc-site/docs/reference/types/_includes/subscription_description.md @@ -63,7 +63,7 @@ by all popular application development frameworks, and are very firewall friendl for connecting applications into your FireFly server. > Check out the [@hyperledger/firefly-sdk](https://www.npmjs.com/package/@hyperledger/firefly-sdk) -> SDK for Node.js applications, and the [hyperledger/firefly-common](https://github.com/hyperledger/firefly-common) +> SDK for Node.js applications, and the [hyperledger-firefly/common](https://github.com/hyperledger-firefly/common) > module for Golang applications. These both contain reliable WebSocket clients for your event listeners. > > A Java SDK is a roadmap item for the community. diff --git a/doc-site/docs/reference/types/_includes/tokenpool_description.md b/doc-site/docs/reference/types/_includes/tokenpool_description.md index be528cd1db..2b5a4cf2e0 100644 --- a/doc-site/docs/reference/types/_includes/tokenpool_description.md +++ b/doc-site/docs/reference/types/_includes/tokenpool_description.md @@ -24,6 +24,6 @@ Some examples of how the generic concept of a Token Pool maps to various well-de partially supported in the same manner as ERC-20/ERC-777, but would require new features for working with partitions These are provided as examples only - a custom token connector could be backed by any token technology (Ethereum or otherwise) -as long as it can support the basic operations described here (create pool, mint, burn, transfer). Other FireFly repos include a sample implementation of a token connector for [ERC-20 and ERC-721](https://github.com/hyperledger/firefly-tokens-erc20-erc721) as well as [ERC-1155](https://github.com/hyperledger/firefly-tokens-erc1155). +as long as it can support the basic operations described here (create pool, mint, burn, transfer). Other FireFly repos include a sample implementation of a token connector for [ERC-20 and ERC-721](https://github.com/hyperledger-firefly/tokens-erc20-erc721) as well as [ERC-1155](https://github.com/hyperledger-firefly/tokens-erc1155). diff --git a/doc-site/docs/releasenotes/1.1_migration_guide.md b/doc-site/docs/releasenotes/1.1_migration_guide.md index 896af8e204..75a35fef74 100644 --- a/doc-site/docs/releasenotes/1.1_migration_guide.md +++ b/doc-site/docs/releasenotes/1.1_migration_guide.md @@ -6,7 +6,7 @@ title: v1.1.0 Migration Guide ## Overview -Hyperledger FireFly v1.1.0 is a feature release that includes significant new functionality around namespaces and plugins, as detailed in [FIR-12](https://github.com/hyperledger/firefly-fir/pull/12). As a result, upgrading an existing FireFly environment from any prior release may require special steps (depending on the functionality used). +Hyperledger FireFly v1.1.0 is a feature release that includes significant new functionality around namespaces and plugins, as detailed in [FIR-12](https://github.com/hyperledger-firefly/fir/pull/12). As a result, upgrading an existing FireFly environment from any prior release may require special steps (depending on the functionality used). If seamless data preservation is not required, you can simply create a new network from scratch using FireFly v1.1.0. @@ -26,7 +26,7 @@ Before upgrading to v1.1.0, it is _strongly_ recommended to upgrade to the lates All items in FireFly's YAML config that were _deprecated_ at any time in the v1.0.x line will be _unsupported_ in v1.1.0. After upgrading to the latest v1.0.x patch release, you should therefore look for any deprecation warnings when starting FireFly, and ensure they are fixed before upgrading to v1.1.0. Failure to do so will cause your config file to be rejected in v1.1.0, and FireFly will fail to start. -You can utilize the [ffconfig](https://github.com/hyperledger/firefly/tree/main/ffconfig) tool to automatically check and fix deprecated config with a command such as: +You can utilize the [ffconfig](https://github.com/hyperledger-firefly/firefly/tree/main/ffconfig) tool to automatically check and fix deprecated config with a command such as: ``` ffconfig migrate -f -o --to 1.0.4 @@ -140,7 +140,7 @@ not guaranteed to work in all scenarios. **Upgrade FireFly and all dependencies** -Bring FireFly down and replace it with the new v1.1.0 binary. You should also replace other runtimes (such as blockchain, data exchange, and token connectors) with the supported versions noted in the [v1.1.0 release](https://github.com/hyperledger/firefly/releases/tag/v1.1.0). Once all binaries have been replaced, start them up again. +Bring FireFly down and replace it with the new v1.1.0 binary. You should also replace other runtimes (such as blockchain, data exchange, and token connectors) with the supported versions noted in the [v1.1.0 release](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.1.0). Once all binaries have been replaced, start them up again. ## After Upgrading @@ -160,7 +160,7 @@ Once the network is stable, you should update your config file(s) again to remov configuration and set yourself up to take advantage of all the new configuration options available in v1.1.0. -You can utilize the [ffconfig](https://github.com/hyperledger/firefly/tree/main/ffconfig) tool to automatically check and fix deprecated config with a command such as: +You can utilize the [ffconfig](https://github.com/hyperledger-firefly/firefly/tree/main/ffconfig) tool to automatically check and fix deprecated config with a command such as: ``` ffconfig migrate -f -o @@ -168,12 +168,12 @@ ffconfig migrate -f -o ## Upgrading the Multi-Party Contract -FireFly v1.1.0 includes a new recommended version of the contract used for multi-party systems (for both [Ethereum](https://github.com/hyperledger/firefly/tree/main/smart_contracts/ethereum/solidity_firefly/contracts) and [Fabric](https://github.com/hyperledger/firefly/tree/main/smart_contracts/fabric/firefly-go/chaincode)). It also introduces a versioning method for this contract, and a path for migrating networks from one contract address to a new one. +FireFly v1.1.0 includes a new recommended version of the contract used for multi-party systems (for both [Ethereum](https://github.com/hyperledger-firefly/firefly/tree/main/smart_contracts/ethereum/solidity_firefly/contracts) and [Fabric](https://github.com/hyperledger-firefly/firefly/tree/main/smart_contracts/fabric/firefly-go/chaincode)). It also introduces a versioning method for this contract, and a path for migrating networks from one contract address to a new one. After upgrading FireFly itself, it is recommended to upgrade your multi-party system to the latest contract version by following these steps. -1. Compile and deploy an instance of the new FireFly contract (linked above) to your blockchain, using `ff deploy` or [a similar method](https://hyperledger.github.io/firefly/tutorials/custom_contracts/ethereum.html#contract-deployment). +1. Compile and deploy an instance of the new FireFly contract (linked above) to your blockchain, using `ff deploy` or [a similar method](https://hyperledger-firefly.github.io/firefly/tutorials/custom_contracts/ethereum.html#contract-deployment). 2. Edit the config file on each node in your network, to add the new contract to the multi-party contract list like so: ``` diff --git a/doc-site/docs/releasenotes/1.2_migration_guide.md b/doc-site/docs/releasenotes/1.2_migration_guide.md index c5cce9a84d..eab545023c 100644 --- a/doc-site/docs/releasenotes/1.2_migration_guide.md +++ b/doc-site/docs/releasenotes/1.2_migration_guide.md @@ -18,7 +18,7 @@ There are quite a few new features around tokens in FireFly v1.2.0. Most notably In FireFly v1.2.0 two of the old, lesser used sample token contracts have been deprecated. The `ERC20NoData` and `ERC721NoData` contracts have been updated and the previous versions are no longer supported, unless you set the `USE_LEGACY_ERC20_SAMPLE=true` or `USE_LEGACY_ERC721_SAMPLE=true` environment variables for your token connector. -For more details you can read the description of the pull requests ([#104](https://github.com/hyperledger/firefly-tokens-erc20-erc721/pull/104) and [#109](https://github.com/hyperledger/firefly-tokens-erc20-erc721/pull/109)) where these changes were made. +For more details you can read the description of the pull requests ([#104](https://github.com/hyperledger-firefly/tokens-erc20-erc721/pull/104) and [#109](https://github.com/hyperledger-firefly/tokens-erc20-erc721/pull/109)) where these changes were made. ### Differences from v1.1.0 @@ -52,7 +52,7 @@ Please see the [optional token fields](#optional-fields) section above for detai ### Transaction output details -In previous versions of FireFly, transaction output details used to appear under the `output` object in the response body. Behind the scenes, some of this data is now fetched from the blockchain connector asynchronously. If your application needs the detailed output, it should now add a `fetchStatus=true` query parameter when querying for an Operation. Additionally the details have moved from the `output` field to a new `detail` field on the response body. For more details, please refer to the PRs where this change was made ([#1111](https://github.com/hyperledger/firefly/pull/1111) and [#1151](https://github.com/hyperledger/firefly/pull/1151)). For a detailed example comparing what an Operation response body looks like in FireFly v1.2.0 compared with v1.1.x, you can expand the sections below. +In previous versions of FireFly, transaction output details used to appear under the `output` object in the response body. Behind the scenes, some of this data is now fetched from the blockchain connector asynchronously. If your application needs the detailed output, it should now add a `fetchStatus=true` query parameter when querying for an Operation. Additionally the details have moved from the `output` field to a new `detail` field on the response body. For more details, please refer to the PRs where this change was made ([#1111](https://github.com/hyperledger-firefly/firefly/pull/1111) and [#1151](https://github.com/hyperledger-firefly/firefly/pull/1151)). For a detailed example comparing what an Operation response body looks like in FireFly v1.2.0 compared with v1.1.x, you can expand the sections below.
v1.2.0 Operation response body with `fetchStatus=true` diff --git a/doc-site/docs/releasenotes/1.3_migration_guide.md b/doc-site/docs/releasenotes/1.3_migration_guide.md index 1cb6b4d045..39452e289e 100644 --- a/doc-site/docs/releasenotes/1.3_migration_guide.md +++ b/doc-site/docs/releasenotes/1.3_migration_guide.md @@ -45,19 +45,19 @@ In FireFly v1.2.0 to create one of the affected resources and publish it to othe Previously, to create a contract interface a `POST` call would be made to `/contracts/interfaces` and the interface would be broadcasted to all other namepsaces. In FireFly v1.3.0, this same call can be made with the `publish=true` query parameter, or a subsequent API call can be made on an unpublished interface on `POST /contracts/interfaces/{name}/{version}/publish` specifying the name and version of the interface. -[For an exact view of the changes to contract interfaces, see PR #1279.](https://github.com/hyperledger/firefly/pull/1279) +[For an exact view of the changes to contract interfaces, see PR #1279.](https://github.com/hyperledger-firefly/firefly/pull/1279) ### Contract APIs Previously, to create a contract API a `POST` call would be made to `/apis` and the API would be broadcasted to all other namepsaces. In FireFly v1.3.0, this same call can be made with the `publish=true` query parameter, or a subsequent API call can be made on an unpublished API on `/apis/{apiName}/publish` specifying the name of the API. -[For an exact view of the changes to contract APIs, see PR #1322.](https://github.com/hyperledger/firefly/pull/1322) +[For an exact view of the changes to contract APIs, see PR #1322.](https://github.com/hyperledger-firefly/firefly/pull/1322) ### Token pools Previously, to create a token pool a `POST` call would be made to `/tokens/pools` and the token pool would be broadcasted to all other namepsaces. In FireFly v1.3.0, this same call can be made with the `publish=true` query parameter, or a subsequent API call can be made on an unpublished token pool on `/tokens/pools/{nameOrId}/publish` specifying the name or ID of the token pool. -[For an exact view of the changes to token pools, see PR #1261.](https://github.com/hyperledger/firefly/pull/1261) +[For an exact view of the changes to token pools, see PR #1261.](https://github.com/hyperledger-firefly/firefly/pull/1261) ## Event stream considerations @@ -71,7 +71,7 @@ The migration to individual event streams promotes high-availability capability Summarily, these changes _should not_ impact end-users of FireFly, but they're noted here as they are significant architectural changes to the relationships between namespaces, plugins, and connectors. -[For an exact view of the changes, see PR #1388.](https://github.com/hyperledger/firefly/pull/1388) +[For an exact view of the changes, see PR #1388.](https://github.com/hyperledger-firefly/firefly/pull/1388) ## Configuration considerations @@ -79,7 +79,7 @@ Summarily, these changes _should not_ impact end-users of FireFly, but they're n In FireFly v1.3.0 deprecated configuration options for the `blockchain`, `database`, `dataexchange`, `sharedstorage` and `tokens` plugins have been removed, and can no longer be provided. -[For an exact view of the changes, see PR #1289](https://github.com/hyperledger/firefly/pull/1289). +[For an exact view of the changes, see PR #1289](https://github.com/hyperledger-firefly/firefly/pull/1289). ## Token pool considerations @@ -89,7 +89,7 @@ Token pools have a status, when creating a token pool previously, it would go in Previously, token pools had a `state` field with an enumerated value which was either `pending`, or `confirmed`, this has been replaced with an `active` boolean field, where `true` indicates the token pool has been committed onto chain, and `false` indicated the transaction has not yet been confirmed. -[For an exact view of the changes, see PR #1305](https://github.com/hyperledger/firefly/pull/1305). +[For an exact view of the changes, see PR #1305](https://github.com/hyperledger-firefly/firefly/pull/1305). ## FabConnect event considerations @@ -97,7 +97,7 @@ Previously, token pools had a `state` field with an enumerated value which was e Prior to FireFly v1.3.0, when the FabConnect client indexed events submitted by the Fabric SDK, FireFly would deduplicate events into a single event because the protocol ID of the events compiled into a single block would evaluate to be the same. In this release, we have changed the format of the calculated protocol ID so that is unique across events even if they are located within the same block. Crucially, **the new format includes the transaction hash, so events are no longer alphanumerically sortable.** -[For an exact view of the changes, see PR #1345](https://github.com/hyperledger/firefly/pull/1345). +[For an exact view of the changes, see PR #1345](https://github.com/hyperledger-firefly/firefly/pull/1345). ## Local development considerations diff --git a/doc-site/docs/releasenotes/index.md b/doc-site/docs/releasenotes/index.md index 57eb9a52a9..8253021859 100644 --- a/doc-site/docs/releasenotes/index.md +++ b/doc-site/docs/releasenotes/index.md @@ -4,13 +4,13 @@ title: Release Notes # Release Notes -[Full release notes](https://github.com/hyperledger/firefly/releases) +[Full release notes](https://github.com/hyperledger-firefly/firefly/releases) -## [v1.4.0 - Jul 17, 2025](https://github.com/hyperledger/firefly/releases/tag/v1.4.0) +## [v1.4.0 - Jul 17, 2025](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.4.0) What's New: -- New Cardano connector https://github.com/hyperledger/firefly-cardano +- New Cardano connector https://github.com/hyperledger-firefly/cardano - Powers a reliable event-stream-based API for applications to react to custom Cardano events - Own signer module for managing keys - Incorporates it's own Balius wrapper framework for smart contracts @@ -22,7 +22,7 @@ What's New: - Documentation updates, new Cardano section in the tutorials - CVE fixes across the board -## [v1.3.3 - Mar 25, 2025](https://github.com/hyperledger/firefly/releases/tag/v1.3.3) +## [v1.3.3 - Mar 25, 2025](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.3.3) What's New: @@ -48,7 +48,7 @@ What's New: As part of the changes to the metrics to add the new `namespace` label, we changed from using a Prometheus `Counter` to a `CounterVec`. As a result there is no default value of `0` on the counter, which means when users query for a specific metric such as `ff_message_rejected_total` it will not be available until the `CounterVec` associated with that metric is incremented. This has been determined to be an easy upgrade for SRE monitoring these metrics, hence inclusion in a patch release. -## [v1.3.2 - Oct 3, 2024](https://github.com/hyperledger/firefly/releases/tag/v1.3.2) +## [v1.3.2 - Oct 3, 2024](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.3.2) What's New: @@ -60,7 +60,7 @@ What's New: - Miscellaneous bug fixes and minor improvements - FireFly has been upgraded to use Go 1.22 -## [v1.3.1 - Aug 5, 2024](https://github.com/hyperledger/firefly/releases/tag/v1.3.1) +## [v1.3.1 - Aug 5, 2024](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.3.1) What's New: @@ -68,7 +68,7 @@ What's New: See [Contract Listeners](../reference/types/contractlistener.md) for details - New multiparty status API at `/status/multiparty` -## [v1.3.0 - April 25, 2024](https://github.com/hyperledger/firefly/releases/tag/v1.3.0) +## [v1.3.0 - April 25, 2024](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.3.0) [Migration guide](1.3_migration_guide.md) @@ -80,7 +80,7 @@ What's New: - Support for batching events when delivering over websockets - Lots of bug fixes and miscellaneous enhancements -## [v1.2.0 - February 6, 2023](https://github.com/hyperledger/firefly/releases/tag/v1.2.0) +## [v1.2.0 - February 6, 2023](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.2.0) [Migration guide](1.2_migration_guide.md) @@ -95,7 +95,7 @@ What's New: - Evmconnect is now the default blockchain connector for Ethereum based FireFly stacks -## [v1.1.0 - September 12, 2022](https://github.com/hyperledger/firefly/releases/tag/v1.1.0) +## [v1.1.0 - September 12, 2022](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.1.0) [Migration guide](1.1_migration_guide.md) @@ -108,7 +108,7 @@ What's New: - Pluggable API Security: Plug in your own API security - Mass Scale Tokens: Support many parallel copies of token plugins for mass scale -## [v1.0.3 - July 07, 2022](https://github.com/hyperledger/firefly/releases/tag/v1.0.3) +## [v1.0.3 - July 07, 2022](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.0.3) What's New: @@ -118,7 +118,7 @@ What's New: - Update token connector versions - Back port of "FAQ and FireFly Tutorial updates" -## [v1.0.2 - May 12, 2022](https://github.com/hyperledger/firefly/releases/tag/v1.0.2) +## [v1.0.2 - May 12, 2022](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.0.2) What's New: @@ -128,14 +128,14 @@ What's New: - Default fabconnect calls to async - Set message header type of broadcast/private -## [v1.0.1 - May 09, 2022](https://github.com/hyperledger/firefly/releases/tag/v1.0.1) +## [v1.0.1 - May 09, 2022](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.0.1) What's New: - Fixes for token approvals - previously approvals would intermittently be missed by FireFly or recorded with incorrect details. - New versions of ERC20/ERC721 connector will assume "no data" support if you create a token pool against an older version of the sample smart contracts. -## [v1.0.0 - April 28, 2022](https://github.com/hyperledger/firefly/releases/tag/v1.0.0) +## [v1.0.0 - April 28, 2022](https://github.com/hyperledger-firefly/firefly/releases/tag/v1.0.0) This release includes lots of major hardening, performance improvements, and bug fixes, as well as more complete documentation and OpenAPI specifications. @@ -147,7 +147,7 @@ What's New: - Cleaner logs and error messages - Lots of bug fixes and miscellaneous enhancements -## [v0.14.0 - March 22, 2022](https://github.com/hyperledger/firefly/releases/tag/v0.14.0) +## [v0.14.0 - March 22, 2022](https://github.com/hyperledger-firefly/firefly/releases/tag/v0.14.0) What's New: @@ -158,7 +158,7 @@ What's New: - Performance updates - Bug fixes -## [v0.13.0 - February 14, 2022](https://github.com/hyperledger/firefly/releases/tag/v0.13.0) +## [v0.13.0 - February 14, 2022](https://github.com/hyperledger-firefly/firefly/releases/tag/v0.13.0) What's New: @@ -169,7 +169,7 @@ What's New: - Metrics reporting to Prometheus - Continued development to support custom on-chain logic (still in preview) -## [v0.12.0 - February 02, 2022](https://github.com/hyperledger/firefly/releases/tag/v0.12.0) +## [v0.12.0 - February 02, 2022](https://github.com/hyperledger-firefly/firefly/releases/tag/v0.12.0) What's New: @@ -179,7 +179,7 @@ What's New: - Overhaul of Transaction type and new BlockchainEvent type - Support for delivery confirmations via DX plugin -## [v0.11.0 - November 22, 2021](https://github.com/hyperledger/firefly/releases/tag/v0.11.0) +## [v0.11.0 - November 22, 2021](https://github.com/hyperledger-firefly/firefly/releases/tag/v0.11.0) What's New: diff --git a/doc-site/docs/swagger/index.md b/doc-site/docs/swagger/index.md index 5f41c02f8e..c6dea97bf4 100644 --- a/doc-site/docs/swagger/index.md +++ b/doc-site/docs/swagger/index.md @@ -4,7 +4,7 @@ title: API Spec This is the FireFly OpenAPI Specification document generated by FireFly -**Note**: The 'Try it out' buttons will not work on this page because it's not running against a live version of FireFly. To actually try it out, we recommend using the [FireFly CLI](https://github.com/hyperledger/firefly-cli) to start an instance on your local machine (which will start the FireFly core on port 5000 by default) and then open the Swagger UI associated with your local node by opening a new tab and visiting [http://localhost:5000/api](http://localhost:5000/api) +**Note**: The 'Try it out' buttons will not work on this page because it's not running against a live version of FireFly. To actually try it out, we recommend using the [FireFly CLI](https://github.com/hyperledger-firefly/cli) to start an instance on your local machine (which will start the FireFly core on port 5000 by default) and then open the Swagger UI associated with your local node by opening a new tab and visiting [http://localhost:5000/api](http://localhost:5000/api) diff --git a/doc-site/docs/tutorials/basic_auth.md b/doc-site/docs/tutorials/basic_auth.md index f584bd22e3..7bd9a29499 100644 --- a/doc-site/docs/tutorials/basic_auth.md +++ b/doc-site/docs/tutorials/basic_auth.md @@ -19,8 +19,8 @@ FireFly has a basic auth plugin built in, which we will be configuring in this t ## Additional info - Config Reference: [HTTP Auth](../reference/config.md#httpauth) -- [Auth plugin interface](https://github.com/hyperledger/firefly-common/blob/main/pkg/auth/plugin.go) -- [Basic auth plugin implementation](https://github.com/hyperledger/firefly-common/blob/main/pkg/auth/basic/basic_auth.go) +- [Auth plugin interface](https://github.com/hyperledger-firefly/common/blob/main/pkg/auth/plugin.go) +- [Basic auth plugin implementation](https://github.com/hyperledger-firefly/common/blob/main/pkg/auth/basic/basic_auth.go) ## Create a password file diff --git a/doc-site/docs/tutorials/broadcast_data.md b/doc-site/docs/tutorials/broadcast_data.md index 6f367a427f..078a4d4933 100644 --- a/doc-site/docs/tutorials/broadcast_data.md +++ b/doc-site/docs/tutorials/broadcast_data.md @@ -144,7 +144,7 @@ and pipe it into a multi-part form post to FireFly. > the `filename`, and `size`, to the JSON part of the `data` object for us._ ```sh -curl -sLo - https://github.com/hyperledger/firefly/raw/main/docs/firefly_logo.png \ +curl -sLo - https://github.com/hyperledger-firefly/firefly/raw/main/docs/firefly_logo.png \ | curl --form autometa=true --form file=@- \ http://localhost:5000/api/v1/namespaces/default/data ``` diff --git a/doc-site/docs/tutorials/chains/cardano.md b/doc-site/docs/tutorials/chains/cardano.md index e16b02706b..709bd4d259 100644 --- a/doc-site/docs/tutorials/chains/cardano.md +++ b/doc-site/docs/tutorials/chains/cardano.md @@ -20,7 +20,7 @@ A Cardano stack can be run in two different ways; using a local Cardano node, or Start a local Cardano node. The fastest way to do this is to [use mithril](https://mithril.network/doc/manual/getting-started/bootstrap-cardano-node/) to bootstrap the node. -For an example of how to bootstrap and run the Cardano node in Docker, see [the firefly-cardano repo](https://github.com/hyperledger/firefly-cardano/blob/1be3b08d301d6d6eeb5b79e40cf3dbf66181c3de/infra/docker-compose.node.yaml#L4). +For an example of how to bootstrap and run the Cardano node in Docker, see [the firefly-cardano repo](https://github.com/hyperledger-firefly/cardano/blob/1be3b08d301d6d6eeb5b79e40cf3dbf66181c3de/infra/docker-compose.node.yaml#L4). The cardano-node exposes a Unix socket named `node.socket`. Pass that to firefly-cli. The example below uses `firefly-cli` to - Create a new Cardano-based stack named `dev`. diff --git a/doc-site/docs/tutorials/chains/fabric_test_network.md b/doc-site/docs/tutorials/chains/fabric_test_network.md index e6a84eaf3b..dce7b16401 100644 --- a/doc-site/docs/tutorials/chains/fabric_test_network.md +++ b/doc-site/docs/tutorials/chains/fabric_test_network.md @@ -24,7 +24,7 @@ For details about the Fabric Test Network and how to set it up, please see the [ ## Deploy FireFly Chaincode -Next we will need to package and deploy the FireFly chaincode to `mychannel` in our new network. For more details on packaging and deploying chaincode, please see the [Fabric chaincode lifecycle documentation](https://hyperledger-fabric.readthedocs.io/en/latest/chaincode_lifecycle.md). If you already have the [FireFly repo](https://github.com/hyperledger/firefly) cloned in the same directory as your `fabric-samples` repo, you can run the following script from your `test-network` directory: +Next we will need to package and deploy the FireFly chaincode to `mychannel` in our new network. For more details on packaging and deploying chaincode, please see the [Fabric chaincode lifecycle documentation](https://hyperledger-fabric.readthedocs.io/en/latest/chaincode_lifecycle.md). If you already have the [FireFly repo](https://github.com/hyperledger-firefly/firefly) cloned in the same directory as your `fabric-samples` repo, you can run the following script from your `test-network` directory: > **NOTE**: This script is provided as a convenience only, and you are not required to use it. You are welcome to package and deploy the chaincode to your test-network any way you would like. diff --git a/doc-site/docs/tutorials/custom_contracts/cardano.md b/doc-site/docs/tutorials/custom_contracts/cardano.md index 8d8301facc..d4ccd087a3 100644 --- a/doc-site/docs/tutorials/custom_contracts/cardano.md +++ b/doc-site/docs/tutorials/custom_contracts/cardano.md @@ -16,9 +16,9 @@ Cardano dApps typically have two components: off-chain and on-chain. ## Writing a dApp -> **NOTE:** The source code to this dApp is also available [on GitHub](https://github.com/hyperledger/firefly-cardano/tree/main/wasm/simple-tx). +> **NOTE:** The source code to this dApp is also available [on GitHub](https://github.com/hyperledger-firefly/cardano/tree/main/wasm/simple-tx). -First, decide on the contract which your dApp will satisfy. FireFly uses [FireFly Interface Format](https://hyperledger.github.io/firefly/latest/reference/firefly_interface_format/) to describe its contracts. Create a file named `contract.json`. An example is below: +First, decide on the contract which your dApp will satisfy. FireFly uses [FireFly Interface Format](https://hyperledger-firefly.github.io/firefly/latest/reference/firefly_interface_format/) to describe its contracts. Create a file named `contract.json`. An example is below: ### Contract @@ -122,7 +122,7 @@ edition = "2021" [dependencies] # The version of firefly-balius should match the version of firefly-cardano which you are using. -firefly-balius = { git = "https://github.com/hyperledger/firefly-cardano", rev = "" } +firefly-balius = { git = "https://github.com/hyperledger-firefly/cardano", rev = "" } pallas-addresses = "0.32" serde = { version = "1", features = ["derive"] } @@ -245,7 +245,7 @@ This tool will ```sh # The version here should match the version of firefly-cardano which you are using. -cargo install --git https://github.com/hyperledger/firefly-cardano --version firefly-cardano-deploy +cargo install --git https://github.com/hyperledger-firefly/cardano --version firefly-cardano-deploy CONTRACT_PATH="/path/to/your/dapp" FIREFLY_URL="http://localhost:5000" diff --git a/doc-site/docs/tutorials/custom_contracts/fabric.md b/doc-site/docs/tutorials/custom_contracts/fabric.md index 037a3a19e5..69c9afdd55 100644 --- a/doc-site/docs/tutorials/custom_contracts/fabric.md +++ b/doc-site/docs/tutorials/custom_contracts/fabric.md @@ -433,7 +433,7 @@ You'll notice in the response body that there are a couple of URLs near the bott ### /invoke/\* endpoints -The `/invoke` endpoints in the generated API are for submitting transactions. These endpoints will be mapped to the `POST /transactions` endpoint of the [FabConnect API](https://github.com/hyperledger/firefly-fabconnect). +The `/invoke` endpoints in the generated API are for submitting transactions. These endpoints will be mapped to the `POST /transactions` endpoint of the [FabConnect API](https://github.com/hyperledger-firefly/fabconnect). ### /query/\* endpoints diff --git a/doc-site/docs/tutorials/custom_contracts/pinning.md b/doc-site/docs/tutorials/custom_contracts/pinning.md index 21eaee8f70..6897bd354f 100644 --- a/doc-site/docs/tutorials/custom_contracts/pinning.md +++ b/doc-site/docs/tutorials/custom_contracts/pinning.md @@ -72,7 +72,7 @@ import ( "fmt" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/firefly/custompin_sample/batchpin" + "github.com/hyperledger-firefly/firefly/custompin_sample/batchpin" ) type SmartContract struct { diff --git a/doc-site/docs/tutorials/private_send.md b/doc-site/docs/tutorials/private_send.md index bb59b5997c..82b5c0d53f 100644 --- a/doc-site/docs/tutorials/private_send.md +++ b/doc-site/docs/tutorials/private_send.md @@ -207,7 +207,7 @@ and pipe it into a multi-part form post to FireFly. > the `filename`, and `size`, to the JSON part of the `data` object for us._ ```sh -curl -sLo - https://github.com/hyperledger/firefly/raw/main/docs/firefly_logo.png \ +curl -sLo - https://github.com/hyperledger-firefly/firefly/raw/main/docs/firefly_logo.png \ | curl --form autometa=true --form file=@- \ http://localhost:5000/api/v1/namespaces/default/data ``` diff --git a/doc-site/docs/tutorials/tokens/erc1155.md b/doc-site/docs/tutorials/tokens/erc1155.md index 17c595239f..a6802b7e20 100644 --- a/doc-site/docs/tutorials/tokens/erc1155.md +++ b/doc-site/docs/tutorials/tokens/erc1155.md @@ -28,7 +28,7 @@ ff start When the FireFly CLI set up your FireFly stack, it also deployed a sample ERC-1155 contract that conforms to the expectations of the token connector. When you create a token pool through FireFly's token APIs, that contract will be used by default. -
⚠️ WARNING: The default token contract that was deployed by the FireFly CLI is only provided for the purpose of learning about FireFly. It is not a production grade contract. If you intend to deploy a production application using tokens on FireFly, you should research token contract best practices. For details, please see the source code for the contract that was deployed.
+
⚠️ WARNING: The default token contract that was deployed by the FireFly CLI is only provided for the purpose of learning about FireFly. It is not a production grade contract. If you intend to deploy a production application using tokens on FireFly, you should research token contract best practices. For details, please see the source code for the contract that was deployed.
## Use the Sandbox (optional) @@ -60,7 +60,7 @@ Other parameters: If you wish to use a contract that is already on the chain, it is recommended that you first upload the ABI for your specific contract by [creating a FireFly contract interface](../custom_contracts/ethereum.md). This step is optional if you're certain that your ERC-1155 ABI conforms to the default expectations of the token connector, but is generally recommended. -See the [README](https://github.com/hyperledger/firefly-tokens-erc1155/blob/main/README.md) of the token connector for details on what contract variants can currently be understood. +See the [README](https://github.com/hyperledger-firefly/tokens-erc1155/blob/main/README.md) of the token connector for details on what contract variants can currently be understood. You can pass a `config` object with an `address` when you make the request to create the token pool, and if you created a contract interface, you can include the `interface` ID as well. diff --git a/doc-site/docs/tutorials/tokens/erc20.md b/doc-site/docs/tutorials/tokens/erc20.md index 7f4c1187fc..baf160794b 100644 --- a/doc-site/docs/tutorials/tokens/erc20.md +++ b/doc-site/docs/tutorials/tokens/erc20.md @@ -14,7 +14,7 @@ If you haven't started a FireFly stack already, please go to the Getting Started If you are using the default ERC-20 / ERC-721 token connector, when the FireFly CLI set up your FireFly stack, it also deployed a token factory contract. When you create a token pool through FireFly's token APIs, the token factory contract will automatically deploy an ERC-20 or ERC-721 contract, based on the pool `type` in the API request. -
⚠️ WARNING: The default token contract that was deployed by the FireFly CLI is only provided for the purpose of learning about FireFly. It is not a production grade contract. If you intend to deploy a production application using tokens on FireFly, you should research token contract best practices. For details, please see the source code for the contract that was deployed.
+
⚠️ WARNING: The default token contract that was deployed by the FireFly CLI is only provided for the purpose of learning about FireFly. It is not a production grade contract. If you intend to deploy a production application using tokens on FireFly, you should research token contract best practices. For details, please see the source code for the contract that was deployed.
## Use the Sandbox (optional) @@ -103,7 +103,7 @@ To lookup the address of the new contract, you can lookup the token pool by its If you wish to index and use a contract that is already on the chain, it is recommended that you first upload the ABI for your specific contract by [creating a FireFly contract interface](../custom_contracts/ethereum.md). This step is optional if you're certain that your ERC-20 ABI conforms to the default expectations of the token connector, but is generally recommended. -See the [README](https://github.com/hyperledger/firefly-tokens-erc20-erc721/blob/main/README.md) of the token connector for details on what contract variants can currently be understood. +See the [README](https://github.com/hyperledger-firefly/tokens-erc20-erc721/blob/main/README.md) of the token connector for details on what contract variants can currently be understood. You can pass a `config` object with an `address` and `blockNumber` when you make the request to create the token pool, and if you created a contract interface, you can include the `interface` ID as well. diff --git a/doc-site/docs/tutorials/tokens/erc721.md b/doc-site/docs/tutorials/tokens/erc721.md index a509f8fc94..881e32df39 100644 --- a/doc-site/docs/tutorials/tokens/erc721.md +++ b/doc-site/docs/tutorials/tokens/erc721.md @@ -14,7 +14,7 @@ If you haven't started a FireFly stack already, please go to the Getting Started If you are using the default ERC-20 / ERC-721 token connector, when the FireFly CLI set up your FireFly stack, it also deployed a token factory contract. When you create a token pool through FireFly's token APIs, the token factory contract will automatically deploy an ERC-20 or ERC-721 contract, based on the pool `type` in the API request. -
⚠️ WARNING: The default token contract that was deployed by the FireFly CLI is only provided for the purpose of learning about FireFly. It is not a production grade contract. If you intend to deploy a production application using tokens on FireFly, you should research token contract best practices. For details, please see the source code for the contract that was deployed.
+
⚠️ WARNING: The default token contract that was deployed by the FireFly CLI is only provided for the purpose of learning about FireFly. It is not a production grade contract. If you intend to deploy a production application using tokens on FireFly, you should research token contract best practices. For details, please see the source code for the contract that was deployed.
## Use the Sandbox (optional) @@ -102,7 +102,7 @@ To lookup the address of the new contract, you can lookup the token pool by its If you wish to index and use a contract that is already on the chain, it is recommended that you first upload the ABI for your specific contract by [creating a FireFly contract interface](../custom_contracts/ethereum.md). This step is optional if you're certain that your ERC-721 ABI conforms to the default expectations of the token connector, but is generally recommended. -See the [README](https://github.com/hyperledger/firefly-tokens-erc20-erc721/blob/main/README.md) of the token connector for details on what contract variants can currently be understood. +See the [README](https://github.com/hyperledger-firefly/tokens-erc20-erc721/blob/main/README.md) of the token connector for details on what contract variants can currently be understood. You can pass a `config` object with an `address` and `blockNumber` when you make the request to create the token pool, and if you created a contract interface, you can include the `interface` ID as well. diff --git a/doc-site/docs/tutorials/tokens/index.md b/doc-site/docs/tutorials/tokens/index.md index 3ea85c52ae..5c8ffd3af7 100644 --- a/doc-site/docs/tutorials/tokens/index.md +++ b/doc-site/docs/tutorials/tokens/index.md @@ -34,6 +34,6 @@ Ethereum standards: partially supported in the same manner as ERC-20/ERC-777, but would require new features for working with partitions These are provided as examples only - a custom token connector could be backed by any token technology (Ethereum or otherwise) -as long as it can support the basic operations described here (create pool, mint, burn, transfer). Other FireFly repos include a sample implementation of a token connector for [ERC-20 and ERC-721](https://github.com/hyperledger/firefly-tokens-erc20-erc721) as well as [ERC-1155](https://github.com/hyperledger/firefly-tokens-erc1155). +as long as it can support the basic operations described here (create pool, mint, burn, transfer). Other FireFly repos include a sample implementation of a token connector for [ERC-20 and ERC-721](https://github.com/hyperledger-firefly/tokens-erc20-erc721) as well as [ERC-1155](https://github.com/hyperledger-firefly/tokens-erc1155). diff --git a/doc-site/mkdocs.yml b/doc-site/mkdocs.yml index b4aced0e19..ff219f4d3f 100644 --- a/doc-site/mkdocs.yml +++ b/doc-site/mkdocs.yml @@ -1,6 +1,6 @@ site_name: Hyperledger FireFly -repo_name: hyperledger/firefly -repo_url: https://github.com/hyperledger/firefly +repo_name: hyperledger-firefly/firefly +repo_url: https://github.com/hyperledger-firefly/firefly theme: name: material custom_dir: overrides diff --git a/ffconfig/README.md b/ffconfig/README.md index 40bc43ea56..c6c8e9d91f 100644 --- a/ffconfig/README.md +++ b/ffconfig/README.md @@ -7,7 +7,7 @@ A tool for managing and migrating config files for Hyperledger FireFly. If you have a local Go development environment, and you have included `${GOPATH}/bin` in your path, you can install with: ```sh -go install github.com/hyperledger/firefly/ffconfig@latest +go install github.com/hyperledger-firefly/firefly/ffconfig@latest ``` ## Usage diff --git a/ffconfig/main.go b/ffconfig/main.go index 93c31716bc..6daa1251e6 100644 --- a/ffconfig/main.go +++ b/ffconfig/main.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/hyperledger/firefly/ffconfig/migrate" + "github.com/hyperledger-firefly/firefly/ffconfig/migrate" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index 302d030e9c..b62d1f5c76 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/hyperledger/firefly +module github.com/hyperledger-firefly/firefly go 1.26.0 @@ -17,8 +17,8 @@ require ( github.com/golang-migrate/migrate/v4 v4.17.0 github.com/gorilla/mux v1.8.1 github.com/gorilla/websocket v1.5.1 - github.com/hyperledger/firefly-common v1.5.6 - github.com/hyperledger/firefly-signer v1.1.21 + github.com/hyperledger-firefly/common v1.6.3 + github.com/hyperledger-firefly/signer v1.2.1 github.com/jarcoal/httpmock v1.2.0 github.com/lib/pq v1.10.9 github.com/mattn/go-sqlite3 v1.14.19 diff --git a/go.sum b/go.sum index b4b2aa978f..d2afb93586 100644 --- a/go.sum +++ b/go.sum @@ -77,10 +77,10 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/firefly-common v1.5.6 h1:z1QsMSkyQ6t6deNhMI68OZV3QidutOE3zU3buqC5M5o= -github.com/hyperledger/firefly-common v1.5.6/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs= -github.com/hyperledger/firefly-signer v1.1.21 h1:r7cTOw6e/6AtiXLf84wZy6Z7zppzlc191HokW2hv4N4= -github.com/hyperledger/firefly-signer v1.1.21/go.mod h1:axrlSQeKrd124UdHF5L3MkTjb5DeTcbJxJNCZ3JmcWM= +github.com/hyperledger-firefly/common v1.6.3 h1:z9Jm6ttwy7AJvrHw0FbjtPT5wLG8n3K8Rrf3MUkifdY= +github.com/hyperledger-firefly/common v1.6.3/go.mod h1:UiHXY2QdM8UUYHDpFpOAt2hwrVL559G8wZ3b68kAEx8= +github.com/hyperledger-firefly/signer v1.2.1 h1:YmnCfiOPhrP/6WIGt5KwV3wiDEI61k7h282MpagSNnI= +github.com/hyperledger-firefly/signer v1.2.1/go.mod h1:qLBLnXZZHk83x68WLvDjx8q80+6lQzx57FPeRyI6jmo= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jarcoal/httpmock v1.2.0 h1:gSvTxxFR/MEMfsGrvRbdfpRUMBStovlSRLw0Ep1bwwc= diff --git a/go.work.sum b/go.work.sum index 26998d3599..f11287e94e 100644 --- a/go.work.sum +++ b/go.work.sum @@ -243,6 +243,7 @@ github.com/aws/smithy-go v1.13.3 h1:l7LYxGuzK6/K+NzJ2mC+VvLUbae0sL3bXU//04MkmnA= github.com/aws/smithy-go v1.13.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.5/go.mod h1:m22FrOAiuxl/tht9wIqAoGHcbnCCaPWyauO8y2LGGtQ= github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= @@ -371,10 +372,12 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= -github.com/hyperledger/firefly-common v1.5.3 h1:ujiDT4eI/QxP1E0ahlJALDn0EsI8wk2Meta2acl4AgU= -github.com/hyperledger/firefly-common v1.5.3/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs= -github.com/hyperledger/firefly-common v1.5.4 h1:UFnN+4tzGIqHnAPh1Q9zw9sKrxwlgG7R1QFP2AIxg8g= -github.com/hyperledger/firefly-common v1.5.4/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs= +github.com/hyperledger-firefly/common v1.5.3 h1:ujiDT4eI/QxP1E0ahlJALDn0EsI8wk2Meta2acl4AgU= +github.com/hyperledger-firefly/common v1.5.3/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs= +github.com/hyperledger-firefly/common v1.5.4 h1:UFnN+4tzGIqHnAPh1Q9zw9sKrxwlgG7R1QFP2AIxg8g= +github.com/hyperledger-firefly/common v1.5.4/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs= +github.com/hyperledger-firefly/common v1.5.6/go.mod h1:1Xawm5PUhxT7k+CL/Kr3i1LE3cTTzoQwZMLimvlW8rs= +github.com/hyperledger-firefly/signer v1.1.21/go.mod h1:axrlSQeKrd124UdHF5L3MkTjb5DeTcbJxJNCZ3JmcWM= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= diff --git a/internal/apiserver/ffi2swagger.go b/internal/apiserver/ffi2swagger.go index c7c3373127..798adc3618 100644 --- a/internal/apiserver/ffi2swagger.go +++ b/internal/apiserver/ffi2swagger.go @@ -25,13 +25,13 @@ import ( "strings" "github.com/getkin/kin-openapi/openapi3" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type FFISwaggerGen interface { diff --git a/internal/apiserver/ffi2swagger_test.go b/internal/apiserver/ffi2swagger_test.go index db9f838c6e..ef7b935470 100644 --- a/internal/apiserver/ffi2swagger_test.go +++ b/internal/apiserver/ffi2swagger_test.go @@ -23,9 +23,9 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/ghodss/yaml" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/apiserver/metrics_server.go b/internal/apiserver/metrics_server.go index 68de6abf5b..13d5561fc1 100644 --- a/internal/apiserver/metrics_server.go +++ b/internal/apiserver/metrics_server.go @@ -17,7 +17,7 @@ package apiserver import ( - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) const ( diff --git a/internal/apiserver/route_date_data_test.go b/internal/apiserver/route_date_data_test.go index 971909f501..5f61b722c0 100644 --- a/internal/apiserver/route_date_data_test.go +++ b/internal/apiserver/route_date_data_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_delete_contract_api.go b/internal/apiserver/route_delete_contract_api.go index 5d763c7239..810f7bef8c 100644 --- a/internal/apiserver/route_delete_contract_api.go +++ b/internal/apiserver/route_delete_contract_api.go @@ -19,8 +19,8 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) var deleteContractAPI = &ffapi.Route{ diff --git a/internal/apiserver/route_delete_contract_api_test.go b/internal/apiserver/route_delete_contract_api_test.go index ec594686f7..7b7b270467 100644 --- a/internal/apiserver/route_delete_contract_api_test.go +++ b/internal/apiserver/route_delete_contract_api_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_delete_contract_interface.go b/internal/apiserver/route_delete_contract_interface.go index 64631f426b..bdd89f066a 100644 --- a/internal/apiserver/route_delete_contract_interface.go +++ b/internal/apiserver/route_delete_contract_interface.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) var deleteContractInterface = &ffapi.Route{ diff --git a/internal/apiserver/route_delete_contract_interface_test.go b/internal/apiserver/route_delete_contract_interface_test.go index a4daf087b1..13aa89d1bb 100644 --- a/internal/apiserver/route_delete_contract_interface_test.go +++ b/internal/apiserver/route_delete_contract_interface_test.go @@ -21,8 +21,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_delete_contract_listener.go b/internal/apiserver/route_delete_contract_listener.go index 38a9a46770..fb154b4f5b 100644 --- a/internal/apiserver/route_delete_contract_listener.go +++ b/internal/apiserver/route_delete_contract_listener.go @@ -19,8 +19,8 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) var deleteContractListener = &ffapi.Route{ diff --git a/internal/apiserver/route_delete_contract_listener_test.go b/internal/apiserver/route_delete_contract_listener_test.go index ad455f175b..fb47274981 100644 --- a/internal/apiserver/route_delete_contract_listener_test.go +++ b/internal/apiserver/route_delete_contract_listener_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_delete_data.go b/internal/apiserver/route_delete_data.go index 92409dd547..f5c6a8a758 100644 --- a/internal/apiserver/route_delete_data.go +++ b/internal/apiserver/route_delete_data.go @@ -19,8 +19,8 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) var deleteData = &ffapi.Route{ diff --git a/internal/apiserver/route_delete_subscription.go b/internal/apiserver/route_delete_subscription.go index cc21ab61c6..f55e3a125c 100644 --- a/internal/apiserver/route_delete_subscription.go +++ b/internal/apiserver/route_delete_subscription.go @@ -19,8 +19,8 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) var deleteSubscription = &ffapi.Route{ diff --git a/internal/apiserver/route_delete_subscription_test.go b/internal/apiserver/route_delete_subscription_test.go index 6d6bbd0fde..0e7d625c44 100644 --- a/internal/apiserver/route_delete_subscription_test.go +++ b/internal/apiserver/route_delete_subscription_test.go @@ -23,8 +23,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_delete_token_pool.go b/internal/apiserver/route_delete_token_pool.go index b69c6d3ac0..e784277ee3 100644 --- a/internal/apiserver/route_delete_token_pool.go +++ b/internal/apiserver/route_delete_token_pool.go @@ -19,8 +19,8 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) var deleteTokenPool = &ffapi.Route{ diff --git a/internal/apiserver/route_delete_token_pool_test.go b/internal/apiserver/route_delete_token_pool_test.go index b238b409bc..ea88e03bc2 100644 --- a/internal/apiserver/route_delete_token_pool_test.go +++ b/internal/apiserver/route_delete_token_pool_test.go @@ -21,8 +21,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_batch_by_id.go b/internal/apiserver/route_get_batch_by_id.go index 7273a05ff3..45cc6b2a66 100644 --- a/internal/apiserver/route_get_batch_by_id.go +++ b/internal/apiserver/route_get_batch_by_id.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getBatchByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_batch_by_id_test.go b/internal/apiserver/route_get_batch_by_id_test.go index 9c100b8c0e..08eabb7ff1 100644 --- a/internal/apiserver/route_get_batch_by_id_test.go +++ b/internal/apiserver/route_get_batch_by_id_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_batches.go b/internal/apiserver/route_get_batches.go index dbaf533215..af627df359 100644 --- a/internal/apiserver/route_get_batches.go +++ b/internal/apiserver/route_get_batches.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getBatches = &ffapi.Route{ diff --git a/internal/apiserver/route_get_batches_test.go b/internal/apiserver/route_get_batches_test.go index ede425331b..dd1ad02171 100644 --- a/internal/apiserver/route_get_batches_test.go +++ b/internal/apiserver/route_get_batches_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_blockchain_event_by_id.go b/internal/apiserver/route_get_blockchain_event_by_id.go index a5c8aa209c..d5db76891b 100644 --- a/internal/apiserver/route_get_blockchain_event_by_id.go +++ b/internal/apiserver/route_get_blockchain_event_by_id.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getBlockchainEventByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_blockchain_event_by_id_test.go b/internal/apiserver/route_get_blockchain_event_by_id_test.go index 3febe51bb4..fc8081f521 100644 --- a/internal/apiserver/route_get_blockchain_event_by_id_test.go +++ b/internal/apiserver/route_get_blockchain_event_by_id_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_blockchain_events.go b/internal/apiserver/route_get_blockchain_events.go index d8b35902d2..b6f59069ac 100644 --- a/internal/apiserver/route_get_blockchain_events.go +++ b/internal/apiserver/route_get_blockchain_events.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getBlockchainEvents = &ffapi.Route{ diff --git a/internal/apiserver/route_get_blockchain_events_test.go b/internal/apiserver/route_get_blockchain_events_test.go index 5f7cf85f70..3f65b7dcf8 100644 --- a/internal/apiserver/route_get_blockchain_events_test.go +++ b/internal/apiserver/route_get_blockchain_events_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_chart_histogram.go b/internal/apiserver/route_get_chart_histogram.go index 025cb24d06..12183f67e1 100644 --- a/internal/apiserver/route_get_chart_histogram.go +++ b/internal/apiserver/route_get_chart_histogram.go @@ -20,12 +20,12 @@ import ( "net/http" "strconv" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getChartHistogram = &ffapi.Route{ diff --git a/internal/apiserver/route_get_chart_histogram_test.go b/internal/apiserver/route_get_chart_histogram_test.go index 84e098f38d..9d2f93b32e 100644 --- a/internal/apiserver/route_get_chart_histogram_test.go +++ b/internal/apiserver/route_get_chart_histogram_test.go @@ -20,9 +20,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_api_by_name.go b/internal/apiserver/route_get_contract_api_by_name.go index 4df16be897..c4d63c2b9d 100644 --- a/internal/apiserver/route_get_contract_api_by_name.go +++ b/internal/apiserver/route_get_contract_api_by_name.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getContractAPIByName = &ffapi.Route{ diff --git a/internal/apiserver/route_get_contract_api_by_name_test.go b/internal/apiserver/route_get_contract_api_by_name_test.go index a31de8e458..4ad903d65d 100644 --- a/internal/apiserver/route_get_contract_api_by_name_test.go +++ b/internal/apiserver/route_get_contract_api_by_name_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_api_interface.go b/internal/apiserver/route_get_contract_api_interface.go index 9b17a1d4d6..d755e88b9d 100644 --- a/internal/apiserver/route_get_contract_api_interface.go +++ b/internal/apiserver/route_get_contract_api_interface.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" ) var getContractAPIInterface = &ffapi.Route{ diff --git a/internal/apiserver/route_get_contract_api_interface_test.go b/internal/apiserver/route_get_contract_api_interface_test.go index 2583a00f07..ecde0a2e25 100644 --- a/internal/apiserver/route_get_contract_api_interface_test.go +++ b/internal/apiserver/route_get_contract_api_interface_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_api_listeners.go b/internal/apiserver/route_get_contract_api_listeners.go index c699fb20ed..56f78476b2 100644 --- a/internal/apiserver/route_get_contract_api_listeners.go +++ b/internal/apiserver/route_get_contract_api_listeners.go @@ -19,11 +19,11 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getContractAPIListeners = &ffapi.Route{ diff --git a/internal/apiserver/route_get_contract_api_listeners_test.go b/internal/apiserver/route_get_contract_api_listeners_test.go index cb08f59384..04cc39fc8a 100644 --- a/internal/apiserver/route_get_contract_api_listeners_test.go +++ b/internal/apiserver/route_get_contract_api_listeners_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_apis.go b/internal/apiserver/route_get_contract_apis.go index 8e7d8274ec..59ae830bfb 100644 --- a/internal/apiserver/route_get_contract_apis.go +++ b/internal/apiserver/route_get_contract_apis.go @@ -19,11 +19,11 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getContractAPIs = &ffapi.Route{ diff --git a/internal/apiserver/route_get_contract_apis_test.go b/internal/apiserver/route_get_contract_apis_test.go index 479df4e6f8..cf6a4f3bea 100644 --- a/internal/apiserver/route_get_contract_apis_test.go +++ b/internal/apiserver/route_get_contract_apis_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_interface.go b/internal/apiserver/route_get_contract_interface.go index e35ec0a1ef..af17da9463 100644 --- a/internal/apiserver/route_get_contract_interface.go +++ b/internal/apiserver/route_get_contract_interface.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" ) var getContractInterface = &ffapi.Route{ diff --git a/internal/apiserver/route_get_contract_interface_name_version.go b/internal/apiserver/route_get_contract_interface_name_version.go index c995da4ca5..4d6f9e3fb3 100644 --- a/internal/apiserver/route_get_contract_interface_name_version.go +++ b/internal/apiserver/route_get_contract_interface_name_version.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" ) var getContractInterfaceNameVersion = &ffapi.Route{ diff --git a/internal/apiserver/route_get_contract_interface_name_version_test.go b/internal/apiserver/route_get_contract_interface_name_version_test.go index b35de17730..a79316e4fa 100644 --- a/internal/apiserver/route_get_contract_interface_name_version_test.go +++ b/internal/apiserver/route_get_contract_interface_name_version_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_interface_test.go b/internal/apiserver/route_get_contract_interface_test.go index a69f0a0329..bb43d48f58 100644 --- a/internal/apiserver/route_get_contract_interface_test.go +++ b/internal/apiserver/route_get_contract_interface_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_interfaces.go b/internal/apiserver/route_get_contract_interfaces.go index 9d07f06227..f2161cf1cb 100644 --- a/internal/apiserver/route_get_contract_interfaces.go +++ b/internal/apiserver/route_get_contract_interfaces.go @@ -19,11 +19,11 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getContractInterfaces = &ffapi.Route{ diff --git a/internal/apiserver/route_get_contract_interfaces_test.go b/internal/apiserver/route_get_contract_interfaces_test.go index 5c5dfa002a..8b95a402df 100644 --- a/internal/apiserver/route_get_contract_interfaces_test.go +++ b/internal/apiserver/route_get_contract_interfaces_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_listener_by_name_or_id.go b/internal/apiserver/route_get_contract_listener_by_name_or_id.go index 4408fe7d38..1329700e1a 100644 --- a/internal/apiserver/route_get_contract_listener_by_name_or_id.go +++ b/internal/apiserver/route_get_contract_listener_by_name_or_id.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getContractListenerByNameOrID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_contract_listener_by_name_or_id_test.go b/internal/apiserver/route_get_contract_listener_by_name_or_id_test.go index b5ec429deb..e15c234de7 100644 --- a/internal/apiserver/route_get_contract_listener_by_name_or_id_test.go +++ b/internal/apiserver/route_get_contract_listener_by_name_or_id_test.go @@ -20,9 +20,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_listener_test.go b/internal/apiserver/route_get_contract_listener_test.go index 188c9ead9e..8bc63b0489 100644 --- a/internal/apiserver/route_get_contract_listener_test.go +++ b/internal/apiserver/route_get_contract_listener_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_contract_listeners.go b/internal/apiserver/route_get_contract_listeners.go index e91d2f4712..0a14142bf0 100644 --- a/internal/apiserver/route_get_contract_listeners.go +++ b/internal/apiserver/route_get_contract_listeners.go @@ -19,11 +19,11 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getContractListeners = &ffapi.Route{ diff --git a/internal/apiserver/route_get_data.go b/internal/apiserver/route_get_data.go index 7a305bf758..032a607ede 100644 --- a/internal/apiserver/route_get_data.go +++ b/internal/apiserver/route_get_data.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getData = &ffapi.Route{ diff --git a/internal/apiserver/route_get_data_blob.go b/internal/apiserver/route_get_data_blob.go index fce1ca6be2..073e668e27 100644 --- a/internal/apiserver/route_get_data_blob.go +++ b/internal/apiserver/route_get_data_blob.go @@ -20,11 +20,11 @@ import ( "net/http" "strconv" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getDataBlob = &ffapi.Route{ diff --git a/internal/apiserver/route_get_data_blob_test.go b/internal/apiserver/route_get_data_blob_test.go index 643195f026..1692f50b6b 100644 --- a/internal/apiserver/route_get_data_blob_test.go +++ b/internal/apiserver/route_get_data_blob_test.go @@ -22,10 +22,10 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_data_by_id.go b/internal/apiserver/route_get_data_by_id.go index 42fd04c441..baeee9c210 100644 --- a/internal/apiserver/route_get_data_by_id.go +++ b/internal/apiserver/route_get_data_by_id.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getDataByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_data_by_id_test.go b/internal/apiserver/route_get_data_by_id_test.go index 2995bf1a53..fd052ce743 100644 --- a/internal/apiserver/route_get_data_by_id_test.go +++ b/internal/apiserver/route_get_data_by_id_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_data_msgs.go b/internal/apiserver/route_get_data_msgs.go index 4249e69581..e37d00b7fb 100644 --- a/internal/apiserver/route_get_data_msgs.go +++ b/internal/apiserver/route_get_data_msgs.go @@ -19,11 +19,11 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getDataMsgs = &ffapi.Route{ diff --git a/internal/apiserver/route_get_data_msgs_test.go b/internal/apiserver/route_get_data_msgs_test.go index 2edc28814e..e61b600f3f 100644 --- a/internal/apiserver/route_get_data_msgs_test.go +++ b/internal/apiserver/route_get_data_msgs_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_data_subpaths.go b/internal/apiserver/route_get_data_subpaths.go index 5ee60d5f24..0f76254623 100644 --- a/internal/apiserver/route_get_data_subpaths.go +++ b/internal/apiserver/route_get_data_subpaths.go @@ -19,8 +19,8 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) var getDataSubPaths = &ffapi.Route{ diff --git a/internal/apiserver/route_get_data_subpaths_test.go b/internal/apiserver/route_get_data_subpaths_test.go index b6a0e78e2f..c84ccac73f 100644 --- a/internal/apiserver/route_get_data_subpaths_test.go +++ b/internal/apiserver/route_get_data_subpaths_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_data_test.go b/internal/apiserver/route_get_data_test.go index c9dfc85972..cdb17c6dd8 100644 --- a/internal/apiserver/route_get_data_test.go +++ b/internal/apiserver/route_get_data_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_data_value.go b/internal/apiserver/route_get_data_value.go index 3caf38d4ae..21efde689c 100644 --- a/internal/apiserver/route_get_data_value.go +++ b/internal/apiserver/route_get_data_value.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getDataValue = &ffapi.Route{ diff --git a/internal/apiserver/route_get_data_value_test.go b/internal/apiserver/route_get_data_value_test.go index 95e06f0eaf..009c4b53ff 100644 --- a/internal/apiserver/route_get_data_value_test.go +++ b/internal/apiserver/route_get_data_value_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_datatype_by_name.go b/internal/apiserver/route_get_datatype_by_name.go index a5b570b411..4c5aa956bf 100644 --- a/internal/apiserver/route_get_datatype_by_name.go +++ b/internal/apiserver/route_get_datatype_by_name.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getDatatypeByName = &ffapi.Route{ diff --git a/internal/apiserver/route_get_datatype_by_name_test.go b/internal/apiserver/route_get_datatype_by_name_test.go index 25f64946b6..10e8d9148b 100644 --- a/internal/apiserver/route_get_datatype_by_name_test.go +++ b/internal/apiserver/route_get_datatype_by_name_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_datatypes.go b/internal/apiserver/route_get_datatypes.go index 70224221f1..92b7de2684 100644 --- a/internal/apiserver/route_get_datatypes.go +++ b/internal/apiserver/route_get_datatypes.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getDatatypes = &ffapi.Route{ diff --git a/internal/apiserver/route_get_datatypes_test.go b/internal/apiserver/route_get_datatypes_test.go index cf3d3220c0..650ccebf12 100644 --- a/internal/apiserver/route_get_datatypes_test.go +++ b/internal/apiserver/route_get_datatypes_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_event_by_id.go b/internal/apiserver/route_get_event_by_id.go index c045ea8109..551135bdfc 100644 --- a/internal/apiserver/route_get_event_by_id.go +++ b/internal/apiserver/route_get_event_by_id.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getEventByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_event_by_id_test.go b/internal/apiserver/route_get_event_by_id_test.go index 72ef9c4d19..ac87a8fc2d 100644 --- a/internal/apiserver/route_get_event_by_id_test.go +++ b/internal/apiserver/route_get_event_by_id_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_events.go b/internal/apiserver/route_get_events.go index c43c43b2a5..8d961b2fad 100644 --- a/internal/apiserver/route_get_events.go +++ b/internal/apiserver/route_get_events.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getEvents = &ffapi.Route{ diff --git a/internal/apiserver/route_get_events_test.go b/internal/apiserver/route_get_events_test.go index d5ccc36ef4..9b0af342b0 100644 --- a/internal/apiserver/route_get_events_test.go +++ b/internal/apiserver/route_get_events_test.go @@ -21,8 +21,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_group_by_id.go b/internal/apiserver/route_get_group_by_id.go index 1af9340812..ed543f5b6c 100644 --- a/internal/apiserver/route_get_group_by_id.go +++ b/internal/apiserver/route_get_group_by_id.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getGroupByHash = &ffapi.Route{ diff --git a/internal/apiserver/route_get_group_by_id_test.go b/internal/apiserver/route_get_group_by_id_test.go index 093fdbf65a..7883ff6d8e 100644 --- a/internal/apiserver/route_get_group_by_id_test.go +++ b/internal/apiserver/route_get_group_by_id_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_groups.go b/internal/apiserver/route_get_groups.go index 233640794e..dbb00dd7d7 100644 --- a/internal/apiserver/route_get_groups.go +++ b/internal/apiserver/route_get_groups.go @@ -19,11 +19,11 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getGroups = &ffapi.Route{ diff --git a/internal/apiserver/route_get_groups_test.go b/internal/apiserver/route_get_groups_test.go index 90468e1c87..5e7551cfaa 100644 --- a/internal/apiserver/route_get_groups_test.go +++ b/internal/apiserver/route_get_groups_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_identities.go b/internal/apiserver/route_get_identities.go index 79f1c8b486..03115718d2 100644 --- a/internal/apiserver/route_get_identities.go +++ b/internal/apiserver/route_get_identities.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getIdentities = &ffapi.Route{ diff --git a/internal/apiserver/route_get_identities_test.go b/internal/apiserver/route_get_identities_test.go index 905f8feefb..5bdd141763 100644 --- a/internal/apiserver/route_get_identities_test.go +++ b/internal/apiserver/route_get_identities_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_identity_by_did.go b/internal/apiserver/route_get_identity_by_did.go index e8025c0c01..679d43817a 100644 --- a/internal/apiserver/route_get_identity_by_did.go +++ b/internal/apiserver/route_get_identity_by_did.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getIdentityByDID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_identity_by_did_test.go b/internal/apiserver/route_get_identity_by_did_test.go index 7052a2a70d..1c57f357ad 100644 --- a/internal/apiserver/route_get_identity_by_did_test.go +++ b/internal/apiserver/route_get_identity_by_did_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_identity_by_id.go b/internal/apiserver/route_get_identity_by_id.go index f489682993..e505962a13 100644 --- a/internal/apiserver/route_get_identity_by_id.go +++ b/internal/apiserver/route_get_identity_by_id.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getIdentityByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_identity_by_id_test.go b/internal/apiserver/route_get_identity_by_id_test.go index b5c1b7828c..ed6ae15f83 100644 --- a/internal/apiserver/route_get_identity_by_id_test.go +++ b/internal/apiserver/route_get_identity_by_id_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_identity_did.go b/internal/apiserver/route_get_identity_did.go index 78db46d9c9..f02c2c2677 100644 --- a/internal/apiserver/route_get_identity_did.go +++ b/internal/apiserver/route_get_identity_did.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/networkmap" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/networkmap" ) var getIdentityDID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_identity_did_test.go b/internal/apiserver/route_get_identity_did_test.go index 5797361838..2312e40414 100644 --- a/internal/apiserver/route_get_identity_did_test.go +++ b/internal/apiserver/route_get_identity_did_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/internal/networkmap" - "github.com/hyperledger/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/internal/networkmap" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_identity_verifiers.go b/internal/apiserver/route_get_identity_verifiers.go index 3ae3f545f8..f24db94ba9 100644 --- a/internal/apiserver/route_get_identity_verifiers.go +++ b/internal/apiserver/route_get_identity_verifiers.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getIdentityVerifiers = &ffapi.Route{ diff --git a/internal/apiserver/route_get_identity_verifiers_test.go b/internal/apiserver/route_get_identity_verifiers_test.go index 30a45fc173..7d689b4294 100644 --- a/internal/apiserver/route_get_identity_verifiers_test.go +++ b/internal/apiserver/route_get_identity_verifiers_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_msg_by_id.go b/internal/apiserver/route_get_msg_by_id.go index c156ac9cdd..d4cc1a4d0a 100644 --- a/internal/apiserver/route_get_msg_by_id.go +++ b/internal/apiserver/route_get_msg_by_id.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getMsgByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_msg_by_id_test.go b/internal/apiserver/route_get_msg_by_id_test.go index 9e8a5cb26c..ee4d13511c 100644 --- a/internal/apiserver/route_get_msg_by_id_test.go +++ b/internal/apiserver/route_get_msg_by_id_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_msg_data.go b/internal/apiserver/route_get_msg_data.go index 11bc519250..a2ad9ba380 100644 --- a/internal/apiserver/route_get_msg_data.go +++ b/internal/apiserver/route_get_msg_data.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getMsgData = &ffapi.Route{ diff --git a/internal/apiserver/route_get_msg_data_test.go b/internal/apiserver/route_get_msg_data_test.go index 2ed67912ca..486cf617ea 100644 --- a/internal/apiserver/route_get_msg_data_test.go +++ b/internal/apiserver/route_get_msg_data_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_msg_events.go b/internal/apiserver/route_get_msg_events.go index 7c45d412e4..0af3c43da8 100644 --- a/internal/apiserver/route_get_msg_events.go +++ b/internal/apiserver/route_get_msg_events.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getMsgEvents = &ffapi.Route{ diff --git a/internal/apiserver/route_get_msg_events_test.go b/internal/apiserver/route_get_msg_events_test.go index b027ada2f6..9f00436c15 100644 --- a/internal/apiserver/route_get_msg_events_test.go +++ b/internal/apiserver/route_get_msg_events_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_msg_txn.go b/internal/apiserver/route_get_msg_txn.go index 1ac4e62bcf..b36f4a92fb 100644 --- a/internal/apiserver/route_get_msg_txn.go +++ b/internal/apiserver/route_get_msg_txn.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getMsgTxn = &ffapi.Route{ diff --git a/internal/apiserver/route_get_msg_txn_test.go b/internal/apiserver/route_get_msg_txn_test.go index 720d602d8d..54fd52455c 100644 --- a/internal/apiserver/route_get_msg_txn_test.go +++ b/internal/apiserver/route_get_msg_txn_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_msgs.go b/internal/apiserver/route_get_msgs.go index 2817a54155..c1ffc0c588 100644 --- a/internal/apiserver/route_get_msgs.go +++ b/internal/apiserver/route_get_msgs.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getMsgs = &ffapi.Route{ diff --git a/internal/apiserver/route_get_msgs_test.go b/internal/apiserver/route_get_msgs_test.go index e055c3e360..e74b3dee37 100644 --- a/internal/apiserver/route_get_msgs_test.go +++ b/internal/apiserver/route_get_msgs_test.go @@ -21,8 +21,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_namespace.go b/internal/apiserver/route_get_namespace.go index 9b682c380c..a9b232d375 100644 --- a/internal/apiserver/route_get_namespace.go +++ b/internal/apiserver/route_get_namespace.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getNamespace = &ffapi.Route{ diff --git a/internal/apiserver/route_get_namespace_test.go b/internal/apiserver/route_get_namespace_test.go index 349337c580..31ab4790e1 100644 --- a/internal/apiserver/route_get_namespace_test.go +++ b/internal/apiserver/route_get_namespace_test.go @@ -22,7 +22,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_namespaces.go b/internal/apiserver/route_get_namespaces.go index 298bd27bf6..87937d084a 100644 --- a/internal/apiserver/route_get_namespaces.go +++ b/internal/apiserver/route_get_namespaces.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getNamespaces = &ffapi.Route{ diff --git a/internal/apiserver/route_get_namespaces_test.go b/internal/apiserver/route_get_namespaces_test.go index 1c59563f8f..3ac60d7464 100644 --- a/internal/apiserver/route_get_namespaces_test.go +++ b/internal/apiserver/route_get_namespaces_test.go @@ -21,7 +21,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_net_did.go b/internal/apiserver/route_get_net_did.go index 8757cfa969..aa8e2c7fb5 100644 --- a/internal/apiserver/route_get_net_did.go +++ b/internal/apiserver/route_get_net_did.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getNetworkIdentityByDID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_net_did_test.go b/internal/apiserver/route_get_net_did_test.go index cbf932ec19..942d32bf65 100644 --- a/internal/apiserver/route_get_net_did_test.go +++ b/internal/apiserver/route_get_net_did_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_net_diddoc.go b/internal/apiserver/route_get_net_diddoc.go index f83240c00d..d17b2ebefb 100644 --- a/internal/apiserver/route_get_net_diddoc.go +++ b/internal/apiserver/route_get_net_diddoc.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/networkmap" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/networkmap" ) var getNetworkDIDDocByDID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_net_diddoc_test.go b/internal/apiserver/route_get_net_diddoc_test.go index 55ccc040ef..fb01426808 100644 --- a/internal/apiserver/route_get_net_diddoc_test.go +++ b/internal/apiserver/route_get_net_diddoc_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/internal/networkmap" - "github.com/hyperledger/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/internal/networkmap" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_net_identities.go b/internal/apiserver/route_get_net_identities.go index ff24f878e5..255a9fd99d 100644 --- a/internal/apiserver/route_get_net_identities.go +++ b/internal/apiserver/route_get_net_identities.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getNetworkIdentities = &ffapi.Route{ diff --git a/internal/apiserver/route_get_net_identities_test.go b/internal/apiserver/route_get_net_identities_test.go index 3b70e8f95e..0e3d0bcacc 100644 --- a/internal/apiserver/route_get_net_identities_test.go +++ b/internal/apiserver/route_get_net_identities_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_net_node.go b/internal/apiserver/route_get_net_node.go index 5653e16739..781dab0591 100644 --- a/internal/apiserver/route_get_net_node.go +++ b/internal/apiserver/route_get_net_node.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getNetworkNode = &ffapi.Route{ diff --git a/internal/apiserver/route_get_net_node_test.go b/internal/apiserver/route_get_net_node_test.go index 4982e071ee..5305bd6bc5 100644 --- a/internal/apiserver/route_get_net_node_test.go +++ b/internal/apiserver/route_get_net_node_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_net_nodes.go b/internal/apiserver/route_get_net_nodes.go index 44f6644177..80133e5476 100644 --- a/internal/apiserver/route_get_net_nodes.go +++ b/internal/apiserver/route_get_net_nodes.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getNetworkNodes = &ffapi.Route{ diff --git a/internal/apiserver/route_get_net_nodes_test.go b/internal/apiserver/route_get_net_nodes_test.go index e13795e2bf..44bf4a4b92 100644 --- a/internal/apiserver/route_get_net_nodes_test.go +++ b/internal/apiserver/route_get_net_nodes_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_net_org.go b/internal/apiserver/route_get_net_org.go index 08da6faabc..f2e2fa0232 100644 --- a/internal/apiserver/route_get_net_org.go +++ b/internal/apiserver/route_get_net_org.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getNetworkOrg = &ffapi.Route{ diff --git a/internal/apiserver/route_get_net_org_test.go b/internal/apiserver/route_get_net_org_test.go index f56b8dbac8..904ffcbce5 100644 --- a/internal/apiserver/route_get_net_org_test.go +++ b/internal/apiserver/route_get_net_org_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_net_orgs.go b/internal/apiserver/route_get_net_orgs.go index 18ee0bfab3..f0e04b4168 100644 --- a/internal/apiserver/route_get_net_orgs.go +++ b/internal/apiserver/route_get_net_orgs.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getNetworkOrgs = &ffapi.Route{ diff --git a/internal/apiserver/route_get_net_orgs_test.go b/internal/apiserver/route_get_net_orgs_test.go index ec4d3eb24d..43d9dd792c 100644 --- a/internal/apiserver/route_get_net_orgs_test.go +++ b/internal/apiserver/route_get_net_orgs_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_nextpins.go b/internal/apiserver/route_get_nextpins.go index 7ae6556396..011d797f58 100644 --- a/internal/apiserver/route_get_nextpins.go +++ b/internal/apiserver/route_get_nextpins.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getNextPins = &ffapi.Route{ diff --git a/internal/apiserver/route_get_nextpins_test.go b/internal/apiserver/route_get_nextpins_test.go index a837ec97cd..0b9e1617b3 100644 --- a/internal/apiserver/route_get_nextpins_test.go +++ b/internal/apiserver/route_get_nextpins_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_op_by_id.go b/internal/apiserver/route_get_op_by_id.go index 46a6408afd..2d112fbc79 100644 --- a/internal/apiserver/route_get_op_by_id.go +++ b/internal/apiserver/route_get_op_by_id.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getOpByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_op_by_id_test.go b/internal/apiserver/route_get_op_by_id_test.go index a92d6adc3c..e59c54d3a4 100644 --- a/internal/apiserver/route_get_op_by_id_test.go +++ b/internal/apiserver/route_get_op_by_id_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_ops.go b/internal/apiserver/route_get_ops.go index 0414b6bf6a..61efdee010 100644 --- a/internal/apiserver/route_get_ops.go +++ b/internal/apiserver/route_get_ops.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getOps = &ffapi.Route{ diff --git a/internal/apiserver/route_get_ops_test.go b/internal/apiserver/route_get_ops_test.go index 8fa755dccb..1ace705858 100644 --- a/internal/apiserver/route_get_ops_test.go +++ b/internal/apiserver/route_get_ops_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_pins.go b/internal/apiserver/route_get_pins.go index 0bbf3ffbaf..ec9253faf0 100644 --- a/internal/apiserver/route_get_pins.go +++ b/internal/apiserver/route_get_pins.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getPins = &ffapi.Route{ diff --git a/internal/apiserver/route_get_pins_test.go b/internal/apiserver/route_get_pins_test.go index 780fff32b7..ce4472d981 100644 --- a/internal/apiserver/route_get_pins_test.go +++ b/internal/apiserver/route_get_pins_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_status.go b/internal/apiserver/route_get_status.go index cde10f149b..4f30c1478c 100644 --- a/internal/apiserver/route_get_status.go +++ b/internal/apiserver/route_get_status.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getStatus = &ffapi.Route{ diff --git a/internal/apiserver/route_get_status_batchmanager.go b/internal/apiserver/route_get_status_batchmanager.go index ab1c3fe9fb..9e123f4b39 100644 --- a/internal/apiserver/route_get_status_batchmanager.go +++ b/internal/apiserver/route_get_status_batchmanager.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" ) var getStatusBatchManager = &ffapi.Route{ diff --git a/internal/apiserver/route_get_status_batchmanager_test.go b/internal/apiserver/route_get_status_batchmanager_test.go index b47104dcf3..39f758b0ac 100644 --- a/internal/apiserver/route_get_status_batchmanager_test.go +++ b/internal/apiserver/route_get_status_batchmanager_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/mocks/batchmocks" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/mocks/batchmocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_status_multiparty.go b/internal/apiserver/route_get_status_multiparty.go index f5d832e4b2..a9085b2ca6 100644 --- a/internal/apiserver/route_get_status_multiparty.go +++ b/internal/apiserver/route_get_status_multiparty.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getStatusMultiparty = &ffapi.Route{ diff --git a/internal/apiserver/route_get_status_multiparty_test.go b/internal/apiserver/route_get_status_multiparty_test.go index 20cf18c0ce..63aee5d3d8 100644 --- a/internal/apiserver/route_get_status_multiparty_test.go +++ b/internal/apiserver/route_get_status_multiparty_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_status_test.go b/internal/apiserver/route_get_status_test.go index f697e0e339..33ddc91e38 100644 --- a/internal/apiserver/route_get_status_test.go +++ b/internal/apiserver/route_get_status_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_subscription_by_id.go b/internal/apiserver/route_get_subscription_by_id.go index 3b29b7960b..ffd32fd9b0 100644 --- a/internal/apiserver/route_get_subscription_by_id.go +++ b/internal/apiserver/route_get_subscription_by_id.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getSubscriptionByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_subscription_by_id_test.go b/internal/apiserver/route_get_subscription_by_id_test.go index 6c34a92a7f..17cde43f74 100644 --- a/internal/apiserver/route_get_subscription_by_id_test.go +++ b/internal/apiserver/route_get_subscription_by_id_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_subscription_events_filtered.go b/internal/apiserver/route_get_subscription_events_filtered.go index d09a4d5842..54bea225e9 100644 --- a/internal/apiserver/route_get_subscription_events_filtered.go +++ b/internal/apiserver/route_get_subscription_events_filtered.go @@ -21,11 +21,11 @@ import ( "net/http" "strconv" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getSubscriptionEventsFiltered = &ffapi.Route{ diff --git a/internal/apiserver/route_get_subscription_events_filtered_test.go b/internal/apiserver/route_get_subscription_events_filtered_test.go index 152e4637af..d93847d5ca 100644 --- a/internal/apiserver/route_get_subscription_events_filtered_test.go +++ b/internal/apiserver/route_get_subscription_events_filtered_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_subscriptions.go b/internal/apiserver/route_get_subscriptions.go index 1e529472f6..c64744f058 100644 --- a/internal/apiserver/route_get_subscriptions.go +++ b/internal/apiserver/route_get_subscriptions.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getSubscriptions = &ffapi.Route{ diff --git a/internal/apiserver/route_get_subscriptions_test.go b/internal/apiserver/route_get_subscriptions_test.go index 1ce50c1630..081eca44cc 100644 --- a/internal/apiserver/route_get_subscriptions_test.go +++ b/internal/apiserver/route_get_subscriptions_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_token_account_pools.go b/internal/apiserver/route_get_token_account_pools.go index ba6801108d..24515d544c 100644 --- a/internal/apiserver/route_get_token_account_pools.go +++ b/internal/apiserver/route_get_token_account_pools.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getTokenAccountPools = &ffapi.Route{ diff --git a/internal/apiserver/route_get_token_account_pools_test.go b/internal/apiserver/route_get_token_account_pools_test.go index 928d55eaed..c0408d068f 100644 --- a/internal/apiserver/route_get_token_account_pools_test.go +++ b/internal/apiserver/route_get_token_account_pools_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_token_accounts.go b/internal/apiserver/route_get_token_accounts.go index a20c973b96..1e82548bae 100644 --- a/internal/apiserver/route_get_token_accounts.go +++ b/internal/apiserver/route_get_token_accounts.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getTokenAccounts = &ffapi.Route{ diff --git a/internal/apiserver/route_get_token_accounts_test.go b/internal/apiserver/route_get_token_accounts_test.go index f279eff661..35d99fe73e 100644 --- a/internal/apiserver/route_get_token_accounts_test.go +++ b/internal/apiserver/route_get_token_accounts_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_token_approvals.go b/internal/apiserver/route_get_token_approvals.go index 062deb0236..886a642563 100644 --- a/internal/apiserver/route_get_token_approvals.go +++ b/internal/apiserver/route_get_token_approvals.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getTokenApprovals = &ffapi.Route{ diff --git a/internal/apiserver/route_get_token_approvals_test.go b/internal/apiserver/route_get_token_approvals_test.go index a8981e54eb..ce07520d2a 100644 --- a/internal/apiserver/route_get_token_approvals_test.go +++ b/internal/apiserver/route_get_token_approvals_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_token_balances.go b/internal/apiserver/route_get_token_balances.go index 946025776b..4442810bc7 100644 --- a/internal/apiserver/route_get_token_balances.go +++ b/internal/apiserver/route_get_token_balances.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getTokenBalances = &ffapi.Route{ diff --git a/internal/apiserver/route_get_token_balances_test.go b/internal/apiserver/route_get_token_balances_test.go index 905e853d70..374a757283 100644 --- a/internal/apiserver/route_get_token_balances_test.go +++ b/internal/apiserver/route_get_token_balances_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_token_connectors.go b/internal/apiserver/route_get_token_connectors.go index 1f264f8920..392214465e 100644 --- a/internal/apiserver/route_get_token_connectors.go +++ b/internal/apiserver/route_get_token_connectors.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getTokenConnectors = &ffapi.Route{ diff --git a/internal/apiserver/route_get_token_connectors_test.go b/internal/apiserver/route_get_token_connectors_test.go index 63f1490d4e..d2d4c7f362 100644 --- a/internal/apiserver/route_get_token_connectors_test.go +++ b/internal/apiserver/route_get_token_connectors_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_token_pool_by_name_or_id.go b/internal/apiserver/route_get_token_pool_by_name_or_id.go index 77966a19ef..e5cd32323d 100644 --- a/internal/apiserver/route_get_token_pool_by_name_or_id.go +++ b/internal/apiserver/route_get_token_pool_by_name_or_id.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getTokenPoolByNameOrID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_token_pool_by_name_or_id_test.go b/internal/apiserver/route_get_token_pool_by_name_or_id_test.go index 5a8740026a..d14436285c 100644 --- a/internal/apiserver/route_get_token_pool_by_name_or_id_test.go +++ b/internal/apiserver/route_get_token_pool_by_name_or_id_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_token_pools.go b/internal/apiserver/route_get_token_pools.go index 1f424e99c8..1e601ff82c 100644 --- a/internal/apiserver/route_get_token_pools.go +++ b/internal/apiserver/route_get_token_pools.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getTokenPools = &ffapi.Route{ diff --git a/internal/apiserver/route_get_token_pools_test.go b/internal/apiserver/route_get_token_pools_test.go index 5bfa821fd0..5bc662bbba 100644 --- a/internal/apiserver/route_get_token_pools_test.go +++ b/internal/apiserver/route_get_token_pools_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_token_transfer_by_id.go b/internal/apiserver/route_get_token_transfer_by_id.go index 33b65ca1b6..6954620853 100644 --- a/internal/apiserver/route_get_token_transfer_by_id.go +++ b/internal/apiserver/route_get_token_transfer_by_id.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getTokenTransferByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_token_transfer_by_id_test.go b/internal/apiserver/route_get_token_transfer_by_id_test.go index 104f1fff98..0211f5d09a 100644 --- a/internal/apiserver/route_get_token_transfer_by_id_test.go +++ b/internal/apiserver/route_get_token_transfer_by_id_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_token_transfers.go b/internal/apiserver/route_get_token_transfers.go index 4f31c1e2e7..002e3dcde6 100644 --- a/internal/apiserver/route_get_token_transfers.go +++ b/internal/apiserver/route_get_token_transfers.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getTokenTransfers = &ffapi.Route{ diff --git a/internal/apiserver/route_get_token_transfers_test.go b/internal/apiserver/route_get_token_transfers_test.go index 20481b286b..de49beb3cb 100644 --- a/internal/apiserver/route_get_token_transfers_test.go +++ b/internal/apiserver/route_get_token_transfers_test.go @@ -21,9 +21,9 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_txn_blockchainevents.go b/internal/apiserver/route_get_txn_blockchainevents.go index b61736b5bf..4f59508f3a 100644 --- a/internal/apiserver/route_get_txn_blockchainevents.go +++ b/internal/apiserver/route_get_txn_blockchainevents.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getTxnBlockchainEvents = &ffapi.Route{ diff --git a/internal/apiserver/route_get_txn_blockchainevents_test.go b/internal/apiserver/route_get_txn_blockchainevents_test.go index 86e8237abf..0210149222 100644 --- a/internal/apiserver/route_get_txn_blockchainevents_test.go +++ b/internal/apiserver/route_get_txn_blockchainevents_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_txn_by_id.go b/internal/apiserver/route_get_txn_by_id.go index bc845e3354..b53fede4e9 100644 --- a/internal/apiserver/route_get_txn_by_id.go +++ b/internal/apiserver/route_get_txn_by_id.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getTxnByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_txn_by_id_test.go b/internal/apiserver/route_get_txn_by_id_test.go index 5ccb93b335..043deba4ab 100644 --- a/internal/apiserver/route_get_txn_by_id_test.go +++ b/internal/apiserver/route_get_txn_by_id_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_txn_ops.go b/internal/apiserver/route_get_txn_ops.go index 75782fb47e..7ea9027666 100644 --- a/internal/apiserver/route_get_txn_ops.go +++ b/internal/apiserver/route_get_txn_ops.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getTxnOps = &ffapi.Route{ diff --git a/internal/apiserver/route_get_txn_ops_test.go b/internal/apiserver/route_get_txn_ops_test.go index df807226c6..4aaefa8a10 100644 --- a/internal/apiserver/route_get_txn_ops_test.go +++ b/internal/apiserver/route_get_txn_ops_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_txn_status.go b/internal/apiserver/route_get_txn_status.go index 5edd3638ba..567f8e8b96 100644 --- a/internal/apiserver/route_get_txn_status.go +++ b/internal/apiserver/route_get_txn_status.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getTxnStatus = &ffapi.Route{ diff --git a/internal/apiserver/route_get_txn_status_test.go b/internal/apiserver/route_get_txn_status_test.go index 7e4678b82b..6b4c39c92b 100644 --- a/internal/apiserver/route_get_txn_status_test.go +++ b/internal/apiserver/route_get_txn_status_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_txns.go b/internal/apiserver/route_get_txns.go index 461d3c8628..f5094c0117 100644 --- a/internal/apiserver/route_get_txns.go +++ b/internal/apiserver/route_get_txns.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getTxns = &ffapi.Route{ diff --git a/internal/apiserver/route_get_txns_test.go b/internal/apiserver/route_get_txns_test.go index 6685e47969..794a98788d 100644 --- a/internal/apiserver/route_get_txns_test.go +++ b/internal/apiserver/route_get_txns_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_verifier_by_id.go b/internal/apiserver/route_get_verifier_by_id.go index 70b5026a00..af64c57a71 100644 --- a/internal/apiserver/route_get_verifier_by_id.go +++ b/internal/apiserver/route_get_verifier_by_id.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getVerifierByID = &ffapi.Route{ diff --git a/internal/apiserver/route_get_verifier_by_id_test.go b/internal/apiserver/route_get_verifier_by_id_test.go index f0172814b4..12b0a28613 100644 --- a/internal/apiserver/route_get_verifier_by_id_test.go +++ b/internal/apiserver/route_get_verifier_by_id_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_verifiers.go b/internal/apiserver/route_get_verifiers.go index a23dbd9883..c28430650b 100644 --- a/internal/apiserver/route_get_verifiers.go +++ b/internal/apiserver/route_get_verifiers.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var getVerifiers = &ffapi.Route{ diff --git a/internal/apiserver/route_get_verifiers_test.go b/internal/apiserver/route_get_verifiers_test.go index 6066549101..6a2f90fb9d 100644 --- a/internal/apiserver/route_get_verifiers_test.go +++ b/internal/apiserver/route_get_verifiers_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_get_websockets.go b/internal/apiserver/route_get_websockets.go index 265d1d4a0c..4a64ba5ceb 100644 --- a/internal/apiserver/route_get_websockets.go +++ b/internal/apiserver/route_get_websockets.go @@ -19,11 +19,11 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/events/eifactory" - "github.com/hyperledger/firefly/internal/events/websockets" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/events/eifactory" + "github.com/hyperledger-firefly/firefly/internal/events/websockets" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var getWebSockets = &ffapi.Route{ diff --git a/internal/apiserver/route_get_websockets_test.go b/internal/apiserver/route_get_websockets_test.go index cd14e6be72..21aa651aab 100644 --- a/internal/apiserver/route_get_websockets_test.go +++ b/internal/apiserver/route_get_websockets_test.go @@ -20,8 +20,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/eventmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/eventmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_patch_update_identity.go b/internal/apiserver/route_patch_update_identity.go index 46ec71e84e..bee3be7dfe 100644 --- a/internal/apiserver/route_patch_update_identity.go +++ b/internal/apiserver/route_patch_update_identity.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var patchUpdateIdentity = &ffapi.Route{ diff --git a/internal/apiserver/route_patch_update_identity_test.go b/internal/apiserver/route_patch_update_identity_test.go index 9ab7cceae1..bfb2dd3743 100644 --- a/internal/apiserver/route_patch_update_identity_test.go +++ b/internal/apiserver/route_patch_update_identity_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_batch_cancel.go b/internal/apiserver/route_post_batch_cancel.go index 5113155fc3..f88ac7f606 100644 --- a/internal/apiserver/route_post_batch_cancel.go +++ b/internal/apiserver/route_post_batch_cancel.go @@ -19,8 +19,8 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) var postBatchCancel = &ffapi.Route{ diff --git a/internal/apiserver/route_post_batch_cancel_test.go b/internal/apiserver/route_post_batch_cancel_test.go index 494dc41f06..f5e5db1d0c 100644 --- a/internal/apiserver/route_post_batch_cancel_test.go +++ b/internal/apiserver/route_post_batch_cancel_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/batchmocks" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/batchmocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_api_invoke.go b/internal/apiserver/route_post_contract_api_invoke.go index 3befc3d513..524652f5dc 100644 --- a/internal/apiserver/route_post_contract_api_invoke.go +++ b/internal/apiserver/route_post_contract_api_invoke.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postContractAPIInvoke = &ffapi.Route{ diff --git a/internal/apiserver/route_post_contract_api_invoke_test.go b/internal/apiserver/route_post_contract_api_invoke_test.go index e60308fc4b..acd27b3437 100644 --- a/internal/apiserver/route_post_contract_api_invoke_test.go +++ b/internal/apiserver/route_post_contract_api_invoke_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_api_listeners.go b/internal/apiserver/route_post_contract_api_listeners.go index 2ec2aecbe7..92acd7a1fb 100644 --- a/internal/apiserver/route_post_contract_api_listeners.go +++ b/internal/apiserver/route_post_contract_api_listeners.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postContractAPIListeners = &ffapi.Route{ diff --git a/internal/apiserver/route_post_contract_api_listeners_test.go b/internal/apiserver/route_post_contract_api_listeners_test.go index 30ad0ddfa6..31d63f4ca9 100644 --- a/internal/apiserver/route_post_contract_api_listeners_test.go +++ b/internal/apiserver/route_post_contract_api_listeners_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_api_publish.go b/internal/apiserver/route_post_contract_api_publish.go index f9c4602a8b..9b232725ec 100644 --- a/internal/apiserver/route_post_contract_api_publish.go +++ b/internal/apiserver/route_post_contract_api_publish.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postContractAPIPublish = &ffapi.Route{ diff --git a/internal/apiserver/route_post_contract_api_publish_test.go b/internal/apiserver/route_post_contract_api_publish_test.go index d40529ac94..61c7e916b5 100644 --- a/internal/apiserver/route_post_contract_api_publish_test.go +++ b/internal/apiserver/route_post_contract_api_publish_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_api_query.go b/internal/apiserver/route_post_contract_api_query.go index 4b685d9bb4..60fc2068dd 100644 --- a/internal/apiserver/route_post_contract_api_query.go +++ b/internal/apiserver/route_post_contract_api_query.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postContractAPIQuery = &ffapi.Route{ diff --git a/internal/apiserver/route_post_contract_api_query_test.go b/internal/apiserver/route_post_contract_api_query_test.go index 16fcbcba1d..3ef62f0e01 100644 --- a/internal/apiserver/route_post_contract_api_query_test.go +++ b/internal/apiserver/route_post_contract_api_query_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_deploy.go b/internal/apiserver/route_post_contract_deploy.go index c233754c5d..d46deaf860 100644 --- a/internal/apiserver/route_post_contract_deploy.go +++ b/internal/apiserver/route_post_contract_deploy.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postContractDeploy = &ffapi.Route{ diff --git a/internal/apiserver/route_post_contract_deploy_test.go b/internal/apiserver/route_post_contract_deploy_test.go index 327cab6110..2e4c8f665b 100644 --- a/internal/apiserver/route_post_contract_deploy_test.go +++ b/internal/apiserver/route_post_contract_deploy_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_interface_generate.go b/internal/apiserver/route_post_contract_interface_generate.go index 0f3136a406..f0035136aa 100644 --- a/internal/apiserver/route_post_contract_interface_generate.go +++ b/internal/apiserver/route_post_contract_interface_generate.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" ) var postContractInterfaceGenerate = &ffapi.Route{ diff --git a/internal/apiserver/route_post_contract_interface_generate_test.go b/internal/apiserver/route_post_contract_interface_generate_test.go index fe5a9e44f7..e1f283a6fb 100644 --- a/internal/apiserver/route_post_contract_interface_generate_test.go +++ b/internal/apiserver/route_post_contract_interface_generate_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_interface_publish.go b/internal/apiserver/route_post_contract_interface_publish.go index 56790402a4..ed1c51d2cb 100644 --- a/internal/apiserver/route_post_contract_interface_publish.go +++ b/internal/apiserver/route_post_contract_interface_publish.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postContractInterfacePublish = &ffapi.Route{ diff --git a/internal/apiserver/route_post_contract_interface_publish_test.go b/internal/apiserver/route_post_contract_interface_publish_test.go index 16f9279c83..946954be63 100644 --- a/internal/apiserver/route_post_contract_interface_publish_test.go +++ b/internal/apiserver/route_post_contract_interface_publish_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_invoke.go b/internal/apiserver/route_post_contract_invoke.go index afe695c4cb..cde560cbe8 100644 --- a/internal/apiserver/route_post_contract_invoke.go +++ b/internal/apiserver/route_post_contract_invoke.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postContractInvoke = &ffapi.Route{ diff --git a/internal/apiserver/route_post_contract_invoke_test.go b/internal/apiserver/route_post_contract_invoke_test.go index 790f81af6b..1f1715109a 100644 --- a/internal/apiserver/route_post_contract_invoke_test.go +++ b/internal/apiserver/route_post_contract_invoke_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_listeners_hash.go b/internal/apiserver/route_post_contract_listeners_hash.go index fdc6b5fb3f..5dc7a8d546 100644 --- a/internal/apiserver/route_post_contract_listeners_hash.go +++ b/internal/apiserver/route_post_contract_listeners_hash.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) /* diff --git a/internal/apiserver/route_post_contract_listeners_hash_test.go b/internal/apiserver/route_post_contract_listeners_hash_test.go index f95cff9610..c5636f48dc 100644 --- a/internal/apiserver/route_post_contract_listeners_hash_test.go +++ b/internal/apiserver/route_post_contract_listeners_hash_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_contract_query.go b/internal/apiserver/route_post_contract_query.go index 9d39973878..b1c01955c1 100644 --- a/internal/apiserver/route_post_contract_query.go +++ b/internal/apiserver/route_post_contract_query.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postContractQuery = &ffapi.Route{ diff --git a/internal/apiserver/route_post_contract_query_test.go b/internal/apiserver/route_post_contract_query_test.go index 908adf6ef7..e577687c86 100644 --- a/internal/apiserver/route_post_contract_query_test.go +++ b/internal/apiserver/route_post_contract_query_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_data.go b/internal/apiserver/route_post_data.go index faa6ccb61e..83b2e5da5b 100644 --- a/internal/apiserver/route_post_data.go +++ b/internal/apiserver/route_post_data.go @@ -22,12 +22,12 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postData = &ffapi.Route{ diff --git a/internal/apiserver/route_post_data_blob_publish.go b/internal/apiserver/route_post_data_blob_publish.go index cd13e7cfe2..f21371cc6f 100644 --- a/internal/apiserver/route_post_data_blob_publish.go +++ b/internal/apiserver/route_post_data_blob_publish.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postDataBlobPublish = &ffapi.Route{ diff --git a/internal/apiserver/route_post_data_blob_publish_test.go b/internal/apiserver/route_post_data_blob_publish_test.go index 494e194a18..c90571f258 100644 --- a/internal/apiserver/route_post_data_blob_publish_test.go +++ b/internal/apiserver/route_post_data_blob_publish_test.go @@ -22,10 +22,10 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_data_test.go b/internal/apiserver/route_post_data_test.go index f7d92d8b14..156ded3fc5 100644 --- a/internal/apiserver/route_post_data_test.go +++ b/internal/apiserver/route_post_data_test.go @@ -24,10 +24,10 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_data_value_publish.go b/internal/apiserver/route_post_data_value_publish.go index d6ba9d9d87..e63f9f461a 100644 --- a/internal/apiserver/route_post_data_value_publish.go +++ b/internal/apiserver/route_post_data_value_publish.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postDataValuePublish = &ffapi.Route{ diff --git a/internal/apiserver/route_post_data_value_publish_test.go b/internal/apiserver/route_post_data_value_publish_test.go index 32bf5066cb..f0f29a25a2 100644 --- a/internal/apiserver/route_post_data_value_publish_test.go +++ b/internal/apiserver/route_post_data_value_publish_test.go @@ -22,10 +22,10 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_network_action.go b/internal/apiserver/route_post_network_action.go index dcab6ac1ee..0ad6c95789 100644 --- a/internal/apiserver/route_post_network_action.go +++ b/internal/apiserver/route_post_network_action.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNetworkAction = &ffapi.Route{ diff --git a/internal/apiserver/route_post_network_action_test.go b/internal/apiserver/route_post_network_action_test.go index c6b78b77c5..519444b63e 100644 --- a/internal/apiserver/route_post_network_action_test.go +++ b/internal/apiserver/route_post_network_action_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_contract_api.go b/internal/apiserver/route_post_new_contract_api.go index e9bfe34879..58e14e2830 100644 --- a/internal/apiserver/route_post_new_contract_api.go +++ b/internal/apiserver/route_post_new_contract_api.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewContractAPI = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_contract_api_test.go b/internal/apiserver/route_post_new_contract_api_test.go index 97c668e6cd..fd03ec694f 100644 --- a/internal/apiserver/route_post_new_contract_api_test.go +++ b/internal/apiserver/route_post_new_contract_api_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_contract_interface.go b/internal/apiserver/route_post_new_contract_interface.go index abfd08acea..19ddb6fe8c 100644 --- a/internal/apiserver/route_post_new_contract_interface.go +++ b/internal/apiserver/route_post_new_contract_interface.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" ) var postNewContractInterface = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_contract_interface_test.go b/internal/apiserver/route_post_new_contract_interface_test.go index 34b4794600..1eccd9de31 100644 --- a/internal/apiserver/route_post_new_contract_interface_test.go +++ b/internal/apiserver/route_post_new_contract_interface_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_contract_listener.go b/internal/apiserver/route_post_new_contract_listener.go index 5c6f9f33f7..66b432bbea 100644 --- a/internal/apiserver/route_post_new_contract_listener.go +++ b/internal/apiserver/route_post_new_contract_listener.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewContractListener = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_contract_listener_test.go b/internal/apiserver/route_post_new_contract_listener_test.go index 048528de98..c28117f914 100644 --- a/internal/apiserver/route_post_new_contract_listener_test.go +++ b/internal/apiserver/route_post_new_contract_listener_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_datatype.go b/internal/apiserver/route_post_new_datatype.go index 5cc7af89ff..f14386bc4e 100644 --- a/internal/apiserver/route_post_new_datatype.go +++ b/internal/apiserver/route_post_new_datatype.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewDatatype = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_datatype_test.go b/internal/apiserver/route_post_new_datatype_test.go index fd6b4ccba4..10f8b7503f 100644 --- a/internal/apiserver/route_post_new_datatype_test.go +++ b/internal/apiserver/route_post_new_datatype_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_identity.go b/internal/apiserver/route_post_new_identity.go index 0b9ab9967b..cc6e9f9450 100644 --- a/internal/apiserver/route_post_new_identity.go +++ b/internal/apiserver/route_post_new_identity.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewIdentity = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_identity_test.go b/internal/apiserver/route_post_new_identity_test.go index 98a7cca8f3..41d48c1fd1 100644 --- a/internal/apiserver/route_post_new_identity_test.go +++ b/internal/apiserver/route_post_new_identity_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_message_broadcast.go b/internal/apiserver/route_post_new_message_broadcast.go index fe0ce52593..49bee08d2a 100644 --- a/internal/apiserver/route_post_new_message_broadcast.go +++ b/internal/apiserver/route_post_new_message_broadcast.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewMessageBroadcast = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_message_broadcast_test.go b/internal/apiserver/route_post_new_message_broadcast_test.go index 0867503ddc..b8f980b986 100644 --- a/internal/apiserver/route_post_new_message_broadcast_test.go +++ b/internal/apiserver/route_post_new_message_broadcast_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_message_private.go b/internal/apiserver/route_post_new_message_private.go index 0411b0cda0..a567f2770c 100644 --- a/internal/apiserver/route_post_new_message_private.go +++ b/internal/apiserver/route_post_new_message_private.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewMessagePrivate = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_message_private_test.go b/internal/apiserver/route_post_new_message_private_test.go index 8a026eedb2..b8cc0fe539 100644 --- a/internal/apiserver/route_post_new_message_private_test.go +++ b/internal/apiserver/route_post_new_message_private_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_message_requestreply.go b/internal/apiserver/route_post_new_message_requestreply.go index d573782ea8..6a43589af2 100644 --- a/internal/apiserver/route_post_new_message_requestreply.go +++ b/internal/apiserver/route_post_new_message_requestreply.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewMessageRequestReply = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_message_requestreply_test.go b/internal/apiserver/route_post_new_message_requestreply_test.go index 40d1eeb461..12721cbac3 100644 --- a/internal/apiserver/route_post_new_message_requestreply_test.go +++ b/internal/apiserver/route_post_new_message_requestreply_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_node_self.go b/internal/apiserver/route_post_new_node_self.go index c606157b86..ae53995c1d 100644 --- a/internal/apiserver/route_post_new_node_self.go +++ b/internal/apiserver/route_post_new_node_self.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNodesSelf = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_node_self_test.go b/internal/apiserver/route_post_new_node_self_test.go index feea86e9eb..a1b04e44ce 100644 --- a/internal/apiserver/route_post_new_node_self_test.go +++ b/internal/apiserver/route_post_new_node_self_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_organization.go b/internal/apiserver/route_post_new_organization.go index 1c26d1673e..5d99ebd531 100644 --- a/internal/apiserver/route_post_new_organization.go +++ b/internal/apiserver/route_post_new_organization.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewOrganization = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_organization_self.go b/internal/apiserver/route_post_new_organization_self.go index 53651a3e0d..49b62ca6ba 100644 --- a/internal/apiserver/route_post_new_organization_self.go +++ b/internal/apiserver/route_post_new_organization_self.go @@ -20,10 +20,10 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewOrganizationSelf = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_organization_self_test.go b/internal/apiserver/route_post_new_organization_self_test.go index 9472125d70..0d8b156a3c 100644 --- a/internal/apiserver/route_post_new_organization_self_test.go +++ b/internal/apiserver/route_post_new_organization_self_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_organization_test.go b/internal/apiserver/route_post_new_organization_test.go index c0b11b0e01..6979a7359e 100644 --- a/internal/apiserver/route_post_new_organization_test.go +++ b/internal/apiserver/route_post_new_organization_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_new_subscription.go b/internal/apiserver/route_post_new_subscription.go index f327679110..b590f50ca2 100644 --- a/internal/apiserver/route_post_new_subscription.go +++ b/internal/apiserver/route_post_new_subscription.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postNewSubscription = &ffapi.Route{ diff --git a/internal/apiserver/route_post_new_subscription_test.go b/internal/apiserver/route_post_new_subscription_test.go index 1355cd071b..1e110c0fc6 100644 --- a/internal/apiserver/route_post_new_subscription_test.go +++ b/internal/apiserver/route_post_new_subscription_test.go @@ -22,7 +22,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_op_retry.go b/internal/apiserver/route_post_op_retry.go index 5c8cedddc6..6c23c57556 100644 --- a/internal/apiserver/route_post_op_retry.go +++ b/internal/apiserver/route_post_op_retry.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postOpRetry = &ffapi.Route{ diff --git a/internal/apiserver/route_post_op_retry_test.go b/internal/apiserver/route_post_op_retry_test.go index 1b287e8370..06ef1a925c 100644 --- a/internal/apiserver/route_post_op_retry_test.go +++ b/internal/apiserver/route_post_op_retry_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_pins_rewind.go b/internal/apiserver/route_post_pins_rewind.go index 57e3cb1309..a3b41e6cb0 100644 --- a/internal/apiserver/route_post_pins_rewind.go +++ b/internal/apiserver/route_post_pins_rewind.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postPinsRewind = &ffapi.Route{ diff --git a/internal/apiserver/route_post_pins_rewind_test.go b/internal/apiserver/route_post_pins_rewind_test.go index 2fbbc33791..04d3d82a91 100644 --- a/internal/apiserver/route_post_pins_rewind_test.go +++ b/internal/apiserver/route_post_pins_rewind_test.go @@ -22,7 +22,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_token_approval.go b/internal/apiserver/route_post_token_approval.go index a7350195a6..b36454b882 100644 --- a/internal/apiserver/route_post_token_approval.go +++ b/internal/apiserver/route_post_token_approval.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postTokenApproval = &ffapi.Route{ diff --git a/internal/apiserver/route_post_token_approval_test.go b/internal/apiserver/route_post_token_approval_test.go index 37b8b2f372..7bba35bc3d 100644 --- a/internal/apiserver/route_post_token_approval_test.go +++ b/internal/apiserver/route_post_token_approval_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_token_burn.go b/internal/apiserver/route_post_token_burn.go index 6b2e19a3dc..b0683a8366 100644 --- a/internal/apiserver/route_post_token_burn.go +++ b/internal/apiserver/route_post_token_burn.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postTokenBurn = &ffapi.Route{ diff --git a/internal/apiserver/route_post_token_burn_test.go b/internal/apiserver/route_post_token_burn_test.go index faa07983b7..a658d50758 100644 --- a/internal/apiserver/route_post_token_burn_test.go +++ b/internal/apiserver/route_post_token_burn_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_token_mint.go b/internal/apiserver/route_post_token_mint.go index 7cc52894c5..64d6425832 100644 --- a/internal/apiserver/route_post_token_mint.go +++ b/internal/apiserver/route_post_token_mint.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postTokenMint = &ffapi.Route{ diff --git a/internal/apiserver/route_post_token_mint_test.go b/internal/apiserver/route_post_token_mint_test.go index b613c05a61..1effcafa61 100644 --- a/internal/apiserver/route_post_token_mint_test.go +++ b/internal/apiserver/route_post_token_mint_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_token_pool.go b/internal/apiserver/route_post_token_pool.go index 84dc6b546a..21fbcd0a1d 100644 --- a/internal/apiserver/route_post_token_pool.go +++ b/internal/apiserver/route_post_token_pool.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postTokenPool = &ffapi.Route{ diff --git a/internal/apiserver/route_post_token_pool_publish.go b/internal/apiserver/route_post_token_pool_publish.go index 6a953ee264..f7e18f6b2d 100644 --- a/internal/apiserver/route_post_token_pool_publish.go +++ b/internal/apiserver/route_post_token_pool_publish.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postTokenPoolPublish = &ffapi.Route{ diff --git a/internal/apiserver/route_post_token_pool_publish_test.go b/internal/apiserver/route_post_token_pool_publish_test.go index fc9aad0b86..3faafff397 100644 --- a/internal/apiserver/route_post_token_pool_publish_test.go +++ b/internal/apiserver/route_post_token_pool_publish_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_token_pool_test.go b/internal/apiserver/route_post_token_pool_test.go index 32f74e7200..df7953ca87 100644 --- a/internal/apiserver/route_post_token_pool_test.go +++ b/internal/apiserver/route_post_token_pool_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_token_transfer.go b/internal/apiserver/route_post_token_transfer.go index 3dd2cb1bc3..b443f0e29a 100644 --- a/internal/apiserver/route_post_token_transfer.go +++ b/internal/apiserver/route_post_token_transfer.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postTokenTransfer = &ffapi.Route{ diff --git a/internal/apiserver/route_post_token_transfer_test.go b/internal/apiserver/route_post_token_transfer_test.go index 1c2593d77f..aa4683b167 100644 --- a/internal/apiserver/route_post_token_transfer_test.go +++ b/internal/apiserver/route_post_token_transfer_test.go @@ -22,8 +22,8 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_post_verifiers_resolve.go b/internal/apiserver/route_post_verifiers_resolve.go index 06d67623f1..d04e012540 100644 --- a/internal/apiserver/route_post_verifiers_resolve.go +++ b/internal/apiserver/route_post_verifiers_resolve.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var postVerifiersResolve = &ffapi.Route{ diff --git a/internal/apiserver/route_post_verifiers_resolve_test.go b/internal/apiserver/route_post_verifiers_resolve_test.go index c9faffa5b8..e6e84758d3 100644 --- a/internal/apiserver/route_post_verifiers_resolve_test.go +++ b/internal/apiserver/route_post_verifiers_resolve_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_put_contract_api.go b/internal/apiserver/route_put_contract_api.go index 7cbd0b5f72..91b453df44 100644 --- a/internal/apiserver/route_put_contract_api.go +++ b/internal/apiserver/route_put_contract_api.go @@ -20,11 +20,11 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var putContractAPI = &ffapi.Route{ diff --git a/internal/apiserver/route_put_contract_api_test.go b/internal/apiserver/route_put_contract_api_test.go index eb6369c03c..2553496f6e 100644 --- a/internal/apiserver/route_put_contract_api_test.go +++ b/internal/apiserver/route_put_contract_api_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_put_subscription.go b/internal/apiserver/route_put_subscription.go index ff7e661e01..0dfba495a7 100644 --- a/internal/apiserver/route_put_subscription.go +++ b/internal/apiserver/route_put_subscription.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var putSubscription = &ffapi.Route{ diff --git a/internal/apiserver/route_put_subscription_test.go b/internal/apiserver/route_put_subscription_test.go index 8c473339e5..2f77fcb848 100644 --- a/internal/apiserver/route_put_subscription_test.go +++ b/internal/apiserver/route_put_subscription_test.go @@ -22,7 +22,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_spi_get_namespace_by_name.go b/internal/apiserver/route_spi_get_namespace_by_name.go index 5ebc4b65b6..c914b7de20 100644 --- a/internal/apiserver/route_spi_get_namespace_by_name.go +++ b/internal/apiserver/route_spi_get_namespace_by_name.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var spiGetNamespaceByName = &ffapi.Route{ diff --git a/internal/apiserver/route_spi_get_namespace_by_name_test.go b/internal/apiserver/route_spi_get_namespace_by_name_test.go index 6f5f00cd81..bec6596cc9 100644 --- a/internal/apiserver/route_spi_get_namespace_by_name_test.go +++ b/internal/apiserver/route_spi_get_namespace_by_name_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_spi_get_namespaces.go b/internal/apiserver/route_spi_get_namespaces.go index c9b1e7486c..cc9ebef6ce 100644 --- a/internal/apiserver/route_spi_get_namespaces.go +++ b/internal/apiserver/route_spi_get_namespaces.go @@ -20,9 +20,9 @@ import ( "net/http" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var spiGetNamespaces = &ffapi.Route{ diff --git a/internal/apiserver/route_spi_get_namespaces_test.go b/internal/apiserver/route_spi_get_namespaces_test.go index 1562cd5b9a..6c2a9ffc0c 100644 --- a/internal/apiserver/route_spi_get_namespaces_test.go +++ b/internal/apiserver/route_spi_get_namespaces_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_spi_get_op_by_id.go b/internal/apiserver/route_spi_get_op_by_id.go index 9f2b3cfa6c..a584be7256 100644 --- a/internal/apiserver/route_spi_get_op_by_id.go +++ b/internal/apiserver/route_spi_get_op_by_id.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var spiGetOpByID = &ffapi.Route{ diff --git a/internal/apiserver/route_spi_get_op_by_id_test.go b/internal/apiserver/route_spi_get_op_by_id_test.go index 09e39ec304..1dc97f869b 100644 --- a/internal/apiserver/route_spi_get_op_by_id_test.go +++ b/internal/apiserver/route_spi_get_op_by_id_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_spi_get_ops.go b/internal/apiserver/route_spi_get_ops.go index 89b2dac259..7fceb18afa 100644 --- a/internal/apiserver/route_spi_get_ops.go +++ b/internal/apiserver/route_spi_get_ops.go @@ -19,10 +19,10 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var spiGetOps = &ffapi.Route{ diff --git a/internal/apiserver/route_spi_get_ops_test.go b/internal/apiserver/route_spi_get_ops_test.go index 44cba70136..0709904d23 100644 --- a/internal/apiserver/route_spi_get_ops_test.go +++ b/internal/apiserver/route_spi_get_ops_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/route_spi_patch_op_by_id.go b/internal/apiserver/route_spi_patch_op_by_id.go index dc1c4880bc..8bea793fe2 100644 --- a/internal/apiserver/route_spi_patch_op_by_id.go +++ b/internal/apiserver/route_spi_patch_op_by_id.go @@ -19,9 +19,9 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var spiPatchOpByID = &ffapi.Route{ diff --git a/internal/apiserver/route_spi_post_reset.go b/internal/apiserver/route_spi_post_reset.go index cba784bf32..ef22e6861c 100644 --- a/internal/apiserver/route_spi_post_reset.go +++ b/internal/apiserver/route_spi_post_reset.go @@ -19,8 +19,8 @@ package apiserver import ( "net/http" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) var spiPostReset = &ffapi.Route{ diff --git a/internal/apiserver/routes.go b/internal/apiserver/routes.go index 3f146cca50..56f522adca 100644 --- a/internal/apiserver/routes.go +++ b/internal/apiserver/routes.go @@ -19,11 +19,11 @@ package apiserver import ( "context" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/namespace" - "github.com/hyperledger/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/namespace" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" ) type coreRequest struct { diff --git a/internal/apiserver/server.go b/internal/apiserver/server.go index 33b977dd22..27ffe5ae7b 100644 --- a/internal/apiserver/server.go +++ b/internal/apiserver/server.go @@ -24,20 +24,20 @@ import ( "time" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/httpserver" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/events/eifactory" - "github.com/hyperledger/firefly/internal/events/websockets" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/namespace" - "github.com/hyperledger/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/httpserver" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/events/eifactory" + "github.com/hyperledger-firefly/firefly/internal/events/websockets" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/namespace" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/internal/apiserver/server_test.go b/internal/apiserver/server_test.go index 444cb13e92..d9f67c389b 100644 --- a/internal/apiserver/server_test.go +++ b/internal/apiserver/server_test.go @@ -31,21 +31,21 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/go-resty/resty/v2" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/httpserver" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/mocks/apiservermocks" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/mocks/namespacemocks" - "github.com/hyperledger/firefly/mocks/orchestratormocks" - "github.com/hyperledger/firefly/mocks/spieventsmocks" - "github.com/hyperledger/firefly/mocks/websocketsmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/httpserver" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/mocks/apiservermocks" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/namespacemocks" + "github.com/hyperledger-firefly/firefly/mocks/orchestratormocks" + "github.com/hyperledger-firefly/firefly/mocks/spieventsmocks" + "github.com/hyperledger-firefly/firefly/mocks/websocketsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/apiserver/spi_routes.go b/internal/apiserver/spi_routes.go index ff22f21c17..068e09ec98 100644 --- a/internal/apiserver/spi_routes.go +++ b/internal/apiserver/spi_routes.go @@ -17,9 +17,9 @@ package apiserver import ( - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) // The Service Provider Interface (SPI) allows external microservices (such as the FireFly Transaction Manager) diff --git a/internal/apiserver/static.go b/internal/apiserver/static.go index 860de4fcd9..cd8b9e09f6 100644 --- a/internal/apiserver/static.go +++ b/internal/apiserver/static.go @@ -23,10 +23,10 @@ import ( "path/filepath" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) type staticHandler struct { diff --git a/internal/apiserver/swagger_check_test.go b/internal/apiserver/swagger_check_test.go index 11de61d7a6..2fa9b0ad23 100644 --- a/internal/apiserver/swagger_check_test.go +++ b/internal/apiserver/swagger_check_test.go @@ -30,9 +30,9 @@ import ( "testing" "github.com/getkin/kin-openapi/openapi3" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" "github.com/stretchr/testify/assert" ) diff --git a/internal/apiserver/swagger_generate_test.go b/internal/apiserver/swagger_generate_test.go index 8d394960a2..427a185002 100644 --- a/internal/apiserver/swagger_generate_test.go +++ b/internal/apiserver/swagger_generate_test.go @@ -30,9 +30,9 @@ import ( "testing" "github.com/getkin/kin-openapi/openapi3" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" "github.com/stretchr/testify/assert" ) diff --git a/internal/assets/manager.go b/internal/assets/manager.go index 605e9738fe..0ca1c77c50 100644 --- a/internal/assets/manager.go +++ b/internal/assets/manager.go @@ -19,23 +19,23 @@ package assets import ( "context" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/broadcast" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/contracts" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/privatemessaging" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/broadcast" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/contracts" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/privatemessaging" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/tokens" ) type Manager interface { diff --git a/internal/assets/manager_test.go b/internal/assets/manager_test.go index 93f4c191f7..52bb798aab 100644 --- a/internal/assets/manager_test.go +++ b/internal/assets/manager_test.go @@ -22,24 +22,24 @@ import ( "testing" "time" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/tokens" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/assets/operations.go b/internal/assets/operations.go index f163491808..482f39d978 100644 --- a/internal/assets/operations.go +++ b/internal/assets/operations.go @@ -20,13 +20,13 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type createPoolData struct { diff --git a/internal/assets/operations_test.go b/internal/assets/operations_test.go index f4c79bb4e2..6c6967d640 100644 --- a/internal/assets/operations_test.go +++ b/internal/assets/operations_test.go @@ -20,11 +20,11 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/assets/token_approval.go b/internal/assets/token_approval.go index ecec79a2e4..90f7d0fd97 100644 --- a/internal/assets/token_approval.go +++ b/internal/assets/token_approval.go @@ -19,14 +19,14 @@ package assets import ( "context" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (am *assetManager) GetTokenApprovals(ctx context.Context, filter ffapi.AndFilter) ([]*core.TokenApproval, *ffapi.FilterResult, error) { diff --git a/internal/assets/token_approval_test.go b/internal/assets/token_approval_test.go index b56ec732a3..168abb1953 100644 --- a/internal/assets/token_approval_test.go +++ b/internal/assets/token_approval_test.go @@ -19,22 +19,22 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/assets/token_pool.go b/internal/assets/token_pool.go index 36c88d4fd5..f8e0198d45 100644 --- a/internal/assets/token_pool.go +++ b/internal/assets/token_pool.go @@ -20,15 +20,15 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (am *assetManager) CreateTokenPool(ctx context.Context, pool *core.TokenPoolInput, waitConfirm bool) (*core.TokenPool, error) { diff --git a/internal/assets/token_pool_test.go b/internal/assets/token_pool_test.go index 92025f5cae..1666b6afe6 100644 --- a/internal/assets/token_pool_test.go +++ b/internal/assets/token_pool_test.go @@ -19,23 +19,23 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/tokens" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/assets/token_transfer.go b/internal/assets/token_transfer.go index 11b947b7b3..6a6e5f823c 100644 --- a/internal/assets/token_transfer.go +++ b/internal/assets/token_transfer.go @@ -19,14 +19,14 @@ package assets import ( "context" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (am *assetManager) GetTokenTransfers(ctx context.Context, filter ffapi.AndFilter) ([]*core.TokenTransfer, *ffapi.FilterResult, error) { diff --git a/internal/assets/token_transfer_test.go b/internal/assets/token_transfer_test.go index cc900f4bd1..3dbb21d9a4 100644 --- a/internal/assets/token_transfer_test.go +++ b/internal/assets/token_transfer_test.go @@ -19,22 +19,22 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/batch/batch_manager.go b/internal/batch/batch_manager.go index ee77ce3b3b..acbe38e789 100644 --- a/internal/batch/batch_manager.go +++ b/internal/batch/batch_manager.go @@ -25,25 +25,25 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func NewBatchManager(ctx context.Context, ns string, di database.Plugin, dm data.Manager, im identity.Manager, txHelper txcommon.Helper) (Manager, error) { if di == nil || dm == nil || im == nil { return nil, i18n.NewError(ctx, coremsgs.MsgInitializationNilDepError, "BatchManager") } - pCtx, cancelCtx := context.WithCancel(log.WithLogField(ctx, "role", "batchmgr")) + pCtx, cancelCtx := context.WithCancel(log.WithLogFields(ctx, "role", "batchmgr")) readPageSize := uint16(1) confReadPageSize := config.GetUint64(coreconfig.BatchManagerReadPageSize) if confReadPageSize > 0 && confReadPageSize <= 65535 { diff --git a/internal/batch/batch_manager_test.go b/internal/batch/batch_manager_test.go index 61e436ee9d..00b138052b 100644 --- a/internal/batch/batch_manager_test.go +++ b/internal/batch/batch_manager_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/batch/batch_processor.go b/internal/batch/batch_processor.go index 7079c9d13b..469841f753 100644 --- a/internal/batch/batch_processor.go +++ b/internal/batch/batch_processor.go @@ -23,16 +23,16 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type batchWork struct { @@ -131,7 +131,7 @@ func (dp *DispatchPayload) addMessageUpdate(messages []*core.Message, fromState const batchSizeEstimateBase = int64(512) func newBatchProcessor(bm *batchManager, conf *batchProcessorConf, baseRetryConf *retry.Retry, txHelper txcommon.Helper) *batchProcessor { - pCtx := log.WithLogField(log.WithLogField(bm.ctx, "d", conf.dispatcherName), "p", conf.name) + pCtx := log.WithLogFields(log.WithLogFields(bm.ctx, "d", conf.dispatcherName), "p", conf.name) pCtx, cancelCtx := context.WithCancel(pCtx) bp := &batchProcessor{ ctx: pCtx, diff --git a/internal/batch/batch_processor_test.go b/internal/batch/batch_processor_test.go index f5704b60e0..180bbbea6c 100644 --- a/internal/batch/batch_processor_test.go +++ b/internal/batch/batch_processor_test.go @@ -22,20 +22,20 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/blockchain/bifactory/factory.go b/internal/blockchain/bifactory/factory.go index a26cbb1bb4..497d197d5e 100644 --- a/internal/blockchain/bifactory/factory.go +++ b/internal/blockchain/bifactory/factory.go @@ -19,15 +19,15 @@ package bifactory import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/blockchain/cardano" - "github.com/hyperledger/firefly/internal/blockchain/ethereum" - "github.com/hyperledger/firefly/internal/blockchain/fabric" - "github.com/hyperledger/firefly/internal/blockchain/tezos" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/blockchain/cardano" + "github.com/hyperledger-firefly/firefly/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/firefly/internal/blockchain/fabric" + "github.com/hyperledger-firefly/firefly/internal/blockchain/tezos" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" ) var pluginsByType = map[string]func() blockchain.Plugin{ diff --git a/internal/blockchain/bifactory/factory_test.go b/internal/blockchain/bifactory/factory_test.go index a2b493c796..60fd8baa73 100644 --- a/internal/blockchain/bifactory/factory_test.go +++ b/internal/blockchain/bifactory/factory_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/cardano/cardano.go b/internal/blockchain/cardano/cardano.go index 5b7be00480..3d330a6b04 100644 --- a/internal/blockchain/cardano/cardano.go +++ b/internal/blockchain/cardano/cardano.go @@ -24,18 +24,18 @@ import ( "strings" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/blockchain/common" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/blockchain/common" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type Cardano struct { @@ -85,7 +85,7 @@ func (c *Cardano) Init(ctx context.Context, cancelCtx context.CancelFunc, conf c c.InitConfig(conf) cardanoconnectConf := c.cardanoconnectConf - c.ctx = log.WithLogField(ctx, "proto", "cardano") + c.ctx = log.WithLogFields(ctx, "proto", "cardano") c.cancelCtx = cancelCtx c.metrics = metrics c.capabilities = &blockchain.Capabilities{} @@ -476,7 +476,7 @@ func (c *Cardano) GenerateFFI(ctx context.Context, generationRequest *fftypes.FF } func (c *Cardano) GetNetworkVersion(ctx context.Context, location *fftypes.JSONAny) (version int, err error) { - // Part of the FIR-12. https://github.com/hyperledger/firefly-fir/pull/12 + // Part of the FIR-12. https://github.com/hyperledger-firefly/fir/pull/12 // Cardano doesn't support any of this yet, so just pretend we're on the new hotness return 2, nil } diff --git a/internal/blockchain/cardano/cardano_test.go b/internal/blockchain/cardano/cardano_test.go index b6375903cd..880bd73314 100644 --- a/internal/blockchain/cardano/cardano_test.go +++ b/internal/blockchain/cardano/cardano_test.go @@ -26,19 +26,19 @@ import ( "testing" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/blockchain/common" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/coremocks" - "github.com/hyperledger/firefly/mocks/wsmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/blockchain/common" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/coremocks" + "github.com/hyperledger-firefly/firefly/mocks/wsmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/blockchain/cardano/config.go b/internal/blockchain/cardano/config.go index 797efc20ec..7f85b79960 100644 --- a/internal/blockchain/cardano/config.go +++ b/internal/blockchain/cardano/config.go @@ -17,8 +17,8 @@ package cardano import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/wsclient" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/wsclient" ) const ( diff --git a/internal/blockchain/cardano/eventstream.go b/internal/blockchain/cardano/eventstream.go index aaa122e8a4..d6fac4e7e9 100644 --- a/internal/blockchain/cardano/eventstream.go +++ b/internal/blockchain/cardano/eventstream.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) type streamManager struct { diff --git a/internal/blockchain/common/common.go b/internal/blockchain/common/common.go index b465da9758..51a0922a03 100644 --- a/internal/blockchain/common/common.go +++ b/internal/blockchain/common/common.go @@ -26,13 +26,13 @@ import ( "sync" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // EventsToDispatch is a by-namespace map of ordered blockchain events. @@ -124,7 +124,7 @@ const ( type BlockchainRESTError struct { Error string `json:"error,omitempty"` - // See https://github.com/hyperledger/firefly-transaction-manager/blob/main/pkg/ffcapi/submission_error.go + // See https://github.com/hyperledger-firefly/transaction-manager/blob/main/pkg/ffcapi/submission_error.go SubmissionRejected bool `json:"submissionRejected,omitempty"` } diff --git a/internal/blockchain/common/common_test.go b/internal/blockchain/common/common_test.go index d56d69d435..29563da58b 100644 --- a/internal/blockchain/common/common_test.go +++ b/internal/blockchain/common/common_test.go @@ -24,13 +24,13 @@ import ( "testing" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/coremocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/coremocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/blockchain/ethereum/abi_definitions.go b/internal/blockchain/ethereum/abi_definitions.go index 8341976ece..223ca6d241 100644 --- a/internal/blockchain/ethereum/abi_definitions.go +++ b/internal/blockchain/ethereum/abi_definitions.go @@ -16,7 +16,7 @@ package ethereum -import "github.com/hyperledger/firefly-signer/pkg/abi" +import "github.com/hyperledger-firefly/signer/pkg/abi" var batchPinMethodABIV1 = &abi.Entry{ Name: "pinBatch", diff --git a/internal/blockchain/ethereum/address_resolver.go b/internal/blockchain/ethereum/address_resolver.go index e1aca8f858..196b0f4d89 100644 --- a/internal/blockchain/ethereum/address_resolver.go +++ b/internal/blockchain/ethereum/address_resolver.go @@ -22,14 +22,14 @@ import ( "text/template" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" ) // addressResolver is a REST-pluggable interface to allow arbitrary strings that reference diff --git a/internal/blockchain/ethereum/address_resolver_test.go b/internal/blockchain/ethereum/address_resolver_test.go index 15fe68d355..b836b162be 100644 --- a/internal/blockchain/ethereum/address_resolver_test.go +++ b/internal/blockchain/ethereum/address_resolver_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "golang.org/x/net/context" diff --git a/internal/blockchain/ethereum/config.go b/internal/blockchain/ethereum/config.go index 6ffed65c32..5355bc1ff7 100644 --- a/internal/blockchain/ethereum/config.go +++ b/internal/blockchain/ethereum/config.go @@ -17,9 +17,9 @@ package ethereum import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/wsclient" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/wsclient" ) const ( diff --git a/internal/blockchain/ethereum/ethereum.go b/internal/blockchain/ethereum/ethereum.go index dce31df1e7..2b04e76bf3 100644 --- a/internal/blockchain/ethereum/ethereum.go +++ b/internal/blockchain/ethereum/ethereum.go @@ -27,21 +27,21 @@ import ( "strings" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ffi2abi" - "github.com/hyperledger/firefly/internal/blockchain/common" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/blockchain/common" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ffi2abi" "github.com/sirupsen/logrus" ) @@ -137,7 +137,7 @@ func (e *Ethereum) Init(ctx context.Context, cancelCtx context.CancelFunc, conf ethconnectConf := e.ethconnectConf addressResolverConf := conf.SubSection(AddressResolverConfigKey) - e.ctx = log.WithLogField(ctx, "proto", "ethereum") + e.ctx = log.WithLogFields(ctx, "proto", "ethereum") e.cancelCtx = cancelCtx e.metrics = metrics e.capabilities = &blockchain.Capabilities{} diff --git a/internal/blockchain/ethereum/ethereum_test.go b/internal/blockchain/ethereum/ethereum_test.go index f1e39cfe81..7b4ff5e2b0 100644 --- a/internal/blockchain/ethereum/ethereum_test.go +++ b/internal/blockchain/ethereum/ethereum_test.go @@ -27,23 +27,23 @@ import ( "time" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/blockchain/common" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/blockchaincommonmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/coremocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/wsmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/blockchain/common" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/blockchaincommonmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/coremocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/wsmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/jarcoal/httpmock" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/blockchain/ethereum/eventstream.go b/internal/blockchain/ethereum/eventstream.go index 30cf4fb32a..733c0e7fcb 100644 --- a/internal/blockchain/ethereum/eventstream.go +++ b/internal/blockchain/ethereum/eventstream.go @@ -26,13 +26,13 @@ import ( "strings" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/signer/pkg/abi" ) type streamManager struct { diff --git a/internal/blockchain/fabric/config.go b/internal/blockchain/fabric/config.go index f2694c3949..1c6df42f4d 100644 --- a/internal/blockchain/fabric/config.go +++ b/internal/blockchain/fabric/config.go @@ -17,8 +17,8 @@ package fabric import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/wsclient" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/wsclient" ) const ( diff --git a/internal/blockchain/fabric/eventstream.go b/internal/blockchain/fabric/eventstream.go index ee719b346c..d1799680db 100644 --- a/internal/blockchain/fabric/eventstream.go +++ b/internal/blockchain/fabric/eventstream.go @@ -24,12 +24,12 @@ import ( "strings" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type streamManager struct { diff --git a/internal/blockchain/fabric/fabric.go b/internal/blockchain/fabric/fabric.go index 467f531ebb..a024bb2639 100644 --- a/internal/blockchain/fabric/fabric.go +++ b/internal/blockchain/fabric/fabric.go @@ -27,19 +27,19 @@ import ( "strings" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/blockchain/common" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/blockchain/common" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) const ( @@ -192,7 +192,7 @@ func (f *Fabric) Init(ctx context.Context, cancelCtx context.CancelFunc, conf co f.InitConfig(conf) fabconnectConf := f.fabconnectConf - f.ctx = log.WithLogField(ctx, "proto", "fabric") + f.ctx = log.WithLogFields(ctx, "proto", "fabric") f.cancelCtx = cancelCtx f.idCache = make(map[string]*fabIdentity) f.metrics = metrics diff --git a/internal/blockchain/fabric/fabric_test.go b/internal/blockchain/fabric/fabric_test.go index 0480abc565..29d5850545 100644 --- a/internal/blockchain/fabric/fabric_test.go +++ b/internal/blockchain/fabric/fabric_test.go @@ -28,23 +28,23 @@ import ( "time" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/blockchain/common" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/blockchaincommonmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/coremocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/wsmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/blockchain/common" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/blockchaincommonmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/coremocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/wsmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/blockchain/tezos/address_resolver.go b/internal/blockchain/tezos/address_resolver.go index 2b8770a3ed..2f178c3632 100644 --- a/internal/blockchain/tezos/address_resolver.go +++ b/internal/blockchain/tezos/address_resolver.go @@ -22,14 +22,14 @@ import ( "strings" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" ) // addressResolver is a REST-pluggable interface to allow arbitrary strings that reference diff --git a/internal/blockchain/tezos/address_resolver_test.go b/internal/blockchain/tezos/address_resolver_test.go index b1135bb632..d4bfddfba9 100644 --- a/internal/blockchain/tezos/address_resolver_test.go +++ b/internal/blockchain/tezos/address_resolver_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "golang.org/x/net/context" diff --git a/internal/blockchain/tezos/config.go b/internal/blockchain/tezos/config.go index 1fe909d7da..918b0f36ce 100644 --- a/internal/blockchain/tezos/config.go +++ b/internal/blockchain/tezos/config.go @@ -17,9 +17,9 @@ package tezos import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/wsclient" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/wsclient" ) const ( diff --git a/internal/blockchain/tezos/eventstream.go b/internal/blockchain/tezos/eventstream.go index 63bdf5af7b..1caa564555 100644 --- a/internal/blockchain/tezos/eventstream.go +++ b/internal/blockchain/tezos/eventstream.go @@ -25,12 +25,12 @@ import ( "net/http" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type streamManager struct { diff --git a/internal/blockchain/tezos/tezos.go b/internal/blockchain/tezos/tezos.go index d641847eb7..e28b9d0d02 100644 --- a/internal/blockchain/tezos/tezos.go +++ b/internal/blockchain/tezos/tezos.go @@ -25,20 +25,20 @@ import ( "blockwatch.cc/tzgo/micheline" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/blockchain/common" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/blockchain/common" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) const ( @@ -144,7 +144,7 @@ func (t *Tezos) Init(ctx context.Context, cancelCtx context.CancelFunc, conf con tezosconnectConf := t.tezosconnectConf addressResolverConf := conf.SubSection(AddressResolverConfigKey) - t.ctx = log.WithLogField(ctx, "proto", "tezos") + t.ctx = log.WithLogFields(ctx, "proto", "tezos") t.cancelCtx = cancelCtx t.metrics = metrics t.capabilities = &blockchain.Capabilities{} @@ -537,7 +537,7 @@ func (t *Tezos) GenerateFFI(ctx context.Context, generationRequest *fftypes.FFIG } func (t *Tezos) GetNetworkVersion(ctx context.Context, location *fftypes.JSONAny) (version int, err error) { - // Part of the FIR-12. https://github.com/hyperledger/firefly-fir/pull/12 + // Part of the FIR-12. https://github.com/hyperledger-firefly/fir/pull/12 // Not actual for the Tezos as it's batch pin contract was after the proposal. // TODO: get the network version from the batch pin contract return 2, nil diff --git a/internal/blockchain/tezos/tezos_test.go b/internal/blockchain/tezos/tezos_test.go index 6df9b89ffd..1e8573a999 100644 --- a/internal/blockchain/tezos/tezos_test.go +++ b/internal/blockchain/tezos/tezos_test.go @@ -27,22 +27,22 @@ import ( "time" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/blockchain/common" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/coremocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/wsmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/blockchain/common" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/coremocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/wsmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/broadcast/manager.go b/internal/broadcast/manager.go index c0c8ff696c..c12b593049 100644 --- a/internal/broadcast/manager.go +++ b/internal/broadcast/manager.go @@ -19,26 +19,26 @@ package broadcast import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/multiparty" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" - "github.com/hyperledger/firefly/pkg/sharedstorage" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/multiparty" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" ) const broadcastDispatcherName = "pinned_broadcast" diff --git a/internal/broadcast/manager_test.go b/internal/broadcast/manager_test.go index db95cd3f11..9cbf9bb990 100644 --- a/internal/broadcast/manager_test.go +++ b/internal/broadcast/manager_test.go @@ -21,26 +21,26 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/mocks/batchmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/sharedstoragemocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/mocks/batchmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/sharedstoragemocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/broadcast/message.go b/internal/broadcast/message.go index 65a3b0ab6e..2198dbd596 100644 --- a/internal/broadcast/message.go +++ b/internal/broadcast/message.go @@ -19,13 +19,13 @@ package broadcast import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (bm *broadcastManager) NewBroadcast(in *core.MessageInOut) syncasync.Sender { diff --git a/internal/broadcast/message_test.go b/internal/broadcast/message_test.go index 9a68e0bd52..cddfd0482d 100644 --- a/internal/broadcast/message_test.go +++ b/internal/broadcast/message_test.go @@ -21,13 +21,13 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/broadcast/operations.go b/internal/broadcast/operations.go index 80d98b39cb..1b11544848 100644 --- a/internal/broadcast/operations.go +++ b/internal/broadcast/operations.go @@ -21,12 +21,12 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type uploadBatchData struct { diff --git a/internal/broadcast/operations_test.go b/internal/broadcast/operations_test.go index ceec07c76f..8609f859f2 100644 --- a/internal/broadcast/operations_test.go +++ b/internal/broadcast/operations_test.go @@ -22,13 +22,13 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/sharedstoragemocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/sharedstoragemocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/cache/cache.go b/internal/cache/cache.go index ec676fddc9..9ad9e1520f 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -21,12 +21,12 @@ import ( "strings" "time" - "github.com/hyperledger/firefly-common/pkg/cache" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/cache" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) type CConfig struct { diff --git a/internal/cache/cache_test.go b/internal/cache/cache_test.go index a5b129d907..839b691f2c 100644 --- a/internal/cache/cache_test.go +++ b/internal/cache/cache_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" "github.com/stretchr/testify/assert" ) diff --git a/internal/contracts/manager.go b/internal/contracts/manager.go index 753ab7e54f..2c8b8f31ef 100644 --- a/internal/contracts/manager.go +++ b/internal/contracts/manager.go @@ -26,26 +26,26 @@ import ( "sort" "strings" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/broadcast" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/privatemessaging" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/internal/txwriter" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/broadcast" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/privatemessaging" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/internal/txwriter" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/santhosh-tekuri/jsonschema/v5" ) diff --git a/internal/contracts/manager_test.go b/internal/contracts/manager_test.go index e936fb28d2..02f11d9bfb 100644 --- a/internal/contracts/manager_test.go +++ b/internal/contracts/manager_test.go @@ -26,31 +26,31 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-signer/pkg/ffi2abi" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/batchmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/mocks/txwritermocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/batchmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/mocks/txwritermocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/signer/pkg/ffi2abi" "github.com/santhosh-tekuri/jsonschema/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/contracts/operations.go b/internal/contracts/operations.go index cbb9c63e3f..5a5593e8e8 100644 --- a/internal/contracts/operations.go +++ b/internal/contracts/operations.go @@ -21,15 +21,15 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type blockchainContractDeployData struct { diff --git a/internal/contracts/operations_test.go b/internal/contracts/operations_test.go index b3dcb9b4ff..2d7e45bc09 100644 --- a/internal/contracts/operations_test.go +++ b/internal/contracts/operations_test.go @@ -22,17 +22,17 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/batchmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/batchmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/coreconfig/coreconfig.go b/internal/coreconfig/coreconfig.go index ad6428ee89..bed7703cbc 100644 --- a/internal/coreconfig/coreconfig.go +++ b/internal/coreconfig/coreconfig.go @@ -17,8 +17,8 @@ package coreconfig import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/spf13/viper" ) diff --git a/internal/coreconfig/coreconfig_test.go b/internal/coreconfig/coreconfig_test.go index 3344cc0ddc..96a76c43de 100644 --- a/internal/coreconfig/coreconfig_test.go +++ b/internal/coreconfig/coreconfig_test.go @@ -19,7 +19,7 @@ package coreconfig import ( "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/internal/coremsgs/en_api_translations.go b/internal/coremsgs/en_api_translations.go index 02f1a96d5c..e7c4aa76e1 100644 --- a/internal/coremsgs/en_api_translations.go +++ b/internal/coremsgs/en_api_translations.go @@ -20,8 +20,8 @@ package coremsgs var ( CoreSystemNSDescription = ffm("core.systemNSDescription", "FireFly system namespace (legacy - no longer used by newer versions)") - APIParamsConfigRecordKeyUpdate = ffm("api.params.configRecordKey.update", "The configuration key to update. This should use dot notation to reference a key documented in https://hyperledger.github.io/firefly/latest/reference/config/") - APIParamsConfigRecordKeyGet = ffm("api.params.configRecordKey.get", "The configuration key to get. This should use dot notation to reference a key documented in https://hyperledger.github.io/firefly/latest/reference/config/") + APIParamsConfigRecordKeyUpdate = ffm("api.params.configRecordKey.update", "The configuration key to update. This should use dot notation to reference a key documented in https://hyperledger-firefly.github.io/firefly/latest/reference/config/") + APIParamsConfigRecordKeyGet = ffm("api.params.configRecordKey.get", "The configuration key to get. This should use dot notation to reference a key documented in https://hyperledger-firefly.github.io/firefly/latest/reference/config/") APIParamsOperationIDGet = ffm("api.params.operationID.get", "The operation ID key to get") APIParamsOperationNamespacedID = ffm("api.params.spiOperationID", "The operation ID as passed to the connector when the operation was performed, including the 'namespace:' prefix") APIParamsNamespace = ffm("api.params.namespace", "The namespace which scopes this request") diff --git a/internal/coremsgs/en_config_descriptions.go b/internal/coremsgs/en_config_descriptions.go index 67c0e07eb5..28e4245fc3 100644 --- a/internal/coremsgs/en_config_descriptions.go +++ b/internal/coremsgs/en_config_descriptions.go @@ -17,7 +17,7 @@ package coremsgs import ( - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "golang.org/x/text/language" ) diff --git a/internal/coremsgs/en_error_messages.go b/internal/coremsgs/en_error_messages.go index dd37050db8..7ca9bd83a0 100644 --- a/internal/coremsgs/en_error_messages.go +++ b/internal/coremsgs/en_error_messages.go @@ -17,7 +17,7 @@ package coremsgs import ( - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "golang.org/x/text/language" ) diff --git a/internal/coremsgs/en_struct_descriptions.go b/internal/coremsgs/en_struct_descriptions.go index 98c2235a1c..8411e61145 100644 --- a/internal/coremsgs/en_struct_descriptions.go +++ b/internal/coremsgs/en_struct_descriptions.go @@ -17,7 +17,7 @@ package coremsgs import ( - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "golang.org/x/text/language" ) diff --git a/internal/data/blobstore.go b/internal/data/blobstore.go index 279ef4acd3..122e5003c0 100644 --- a/internal/data/blobstore.go +++ b/internal/data/blobstore.go @@ -23,14 +23,14 @@ import ( "io" "github.com/docker/go-units" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) type blobStore struct { diff --git a/internal/data/blobstore_test.go b/internal/data/blobstore_test.go index 33efd0700b..64f2492f04 100644 --- a/internal/data/blobstore_test.go +++ b/internal/data/blobstore_test.go @@ -27,12 +27,12 @@ import ( "testing" "testing/iotest" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/data/data_manager.go b/internal/data/data_manager.go index d807698fda..f73a8b0bfd 100644 --- a/internal/data/data_manager.go +++ b/internal/data/data_manager.go @@ -21,17 +21,17 @@ import ( "fmt" "io" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) type Manager interface { diff --git a/internal/data/data_manager_test.go b/internal/data/data_manager_test.go index a8a3e9afd2..bab130a9f9 100644 --- a/internal/data/data_manager_test.go +++ b/internal/data/data_manager_test.go @@ -23,16 +23,16 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/data/json_validator.go b/internal/data/json_validator.go index befc67a3c7..1e0d78cf03 100644 --- a/internal/data/json_validator.go +++ b/internal/data/json_validator.go @@ -21,11 +21,11 @@ import ( "encoding/json" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/santhosh-tekuri/jsonschema/v5" ) diff --git a/internal/data/json_validator_test.go b/internal/data/json_validator_test.go index 93ab7415f6..5557b8716c 100644 --- a/internal/data/json_validator_test.go +++ b/internal/data/json_validator_test.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/data/message_writer.go b/internal/data/message_writer.go index 84f7079085..9c8507b5f8 100644 --- a/internal/data/message_writer.go +++ b/internal/data/message_writer.go @@ -20,12 +20,12 @@ import ( "context" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type NewMessage struct { diff --git a/internal/data/message_writer_test.go b/internal/data/message_writer_test.go index 9604877b17..a779a6fe2e 100644 --- a/internal/data/message_writer_test.go +++ b/internal/data/message_writer_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/data/validator.go b/internal/data/validator.go index 37b4e20aa0..03b40c69ed 100644 --- a/internal/data/validator.go +++ b/internal/data/validator.go @@ -19,8 +19,8 @@ package data import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type Validator interface { diff --git a/internal/database/difactory/factory.go b/internal/database/difactory/factory.go index 73ab0bd8ff..a611f9f39c 100644 --- a/internal/database/difactory/factory.go +++ b/internal/database/difactory/factory.go @@ -19,11 +19,11 @@ package difactory import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func InitConfig(config config.ArraySection) { diff --git a/internal/database/difactory/factory_test.go b/internal/database/difactory/factory_test.go index f334df0875..f258701ea7 100644 --- a/internal/database/difactory/factory_test.go +++ b/internal/database/difactory/factory_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/difactory/plugins_cgo.go b/internal/database/difactory/plugins_cgo.go index 632ebaa63d..6667105db7 100644 --- a/internal/database/difactory/plugins_cgo.go +++ b/internal/database/difactory/plugins_cgo.go @@ -20,9 +20,9 @@ package difactory import ( - "github.com/hyperledger/firefly/internal/database/postgres" - "github.com/hyperledger/firefly/internal/database/sqlite3" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/internal/database/postgres" + "github.com/hyperledger-firefly/firefly/internal/database/sqlite3" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var pluginsByName = map[string]func() database.Plugin{ diff --git a/internal/database/difactory/plugins_nocgo.go b/internal/database/difactory/plugins_nocgo.go index 70064291fd..40adbb039f 100644 --- a/internal/database/difactory/plugins_nocgo.go +++ b/internal/database/difactory/plugins_nocgo.go @@ -20,8 +20,8 @@ package difactory import ( - "github.com/hyperledger/firefly/internal/database/postgres" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/internal/database/postgres" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var pluginsByName = map[string]func() database.Plugin{ diff --git a/internal/database/postgres/config.go b/internal/database/postgres/config.go index 724359f895..e0592ac63f 100644 --- a/internal/database/postgres/config.go +++ b/internal/database/postgres/config.go @@ -17,8 +17,8 @@ package postgres import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" ) const ( diff --git a/internal/database/postgres/postgres.go b/internal/database/postgres/postgres.go index c4e573c7a0..7ccf3653ea 100644 --- a/internal/database/postgres/postgres.go +++ b/internal/database/postgres/postgres.go @@ -26,10 +26,10 @@ import ( sq "github.com/Masterminds/squirrel" migratedb "github.com/golang-migrate/migrate/v4/database" "github.com/golang-migrate/migrate/v4/database/postgres" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/pkg/database" // Import pq driver _ "github.com/lib/pq" diff --git a/internal/database/postgres/postgres_test.go b/internal/database/postgres/postgres_test.go index 18ff0c23f4..b957ef4ffa 100644 --- a/internal/database/postgres/postgres_test.go +++ b/internal/database/postgres/postgres_test.go @@ -21,9 +21,9 @@ import ( "testing" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/batch_sql.go b/internal/database/sqlcommon/batch_sql.go index 74a128a9df..12606a789d 100644 --- a/internal/database/sqlcommon/batch_sql.go +++ b/internal/database/sqlcommon/batch_sql.go @@ -21,13 +21,13 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/batch_sql_test.go b/internal/database/sqlcommon/batch_sql_test.go index 76d4a946d0..404e833e66 100644 --- a/internal/database/sqlcommon/batch_sql_test.go +++ b/internal/database/sqlcommon/batch_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/blob_sql.go b/internal/database/sqlcommon/blob_sql.go index 6bbc34b17d..27eee8eb91 100644 --- a/internal/database/sqlcommon/blob_sql.go +++ b/internal/database/sqlcommon/blob_sql.go @@ -21,11 +21,11 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var ( diff --git a/internal/database/sqlcommon/blob_sql_test.go b/internal/database/sqlcommon/blob_sql_test.go index 5324fda694..1b97af9b1b 100644 --- a/internal/database/sqlcommon/blob_sql_test.go +++ b/internal/database/sqlcommon/blob_sql_test.go @@ -23,10 +23,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/blockchainevents_sql.go b/internal/database/sqlcommon/blockchainevents_sql.go index f6c13c06b8..8835de6d49 100644 --- a/internal/database/sqlcommon/blockchainevents_sql.go +++ b/internal/database/sqlcommon/blockchainevents_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/blockchainevents_sql_test.go b/internal/database/sqlcommon/blockchainevents_sql_test.go index 89f7b2dd85..2bd2febf0a 100644 --- a/internal/database/sqlcommon/blockchainevents_sql_test.go +++ b/internal/database/sqlcommon/blockchainevents_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/chart_sql.go b/internal/database/sqlcommon/chart_sql.go index 86d7fb27f0..725f701c4e 100644 --- a/internal/database/sqlcommon/chart_sql.go +++ b/internal/database/sqlcommon/chart_sql.go @@ -22,12 +22,12 @@ import ( "strconv" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (s *SQLCommon) getTableNameFromCollection(ctx context.Context, collection database.CollectionName) (tableName string, fieldMap map[string]string, err error) { diff --git a/internal/database/sqlcommon/chart_sql_test.go b/internal/database/sqlcommon/chart_sql_test.go index 2df51d1441..6f98d3c37e 100644 --- a/internal/database/sqlcommon/chart_sql_test.go +++ b/internal/database/sqlcommon/chart_sql_test.go @@ -22,11 +22,11 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/config.go b/internal/database/sqlcommon/config.go index 02817de951..2da1dc9182 100644 --- a/internal/database/sqlcommon/config.go +++ b/internal/database/sqlcommon/config.go @@ -19,8 +19,8 @@ package sqlcommon import ( "fmt" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/dbsql" ) const ( diff --git a/internal/database/sqlcommon/contractapis_sql.go b/internal/database/sqlcommon/contractapis_sql.go index 4d31b578bd..cc6b71634d 100644 --- a/internal/database/sqlcommon/contractapis_sql.go +++ b/internal/database/sqlcommon/contractapis_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/contractapis_sql_test.go b/internal/database/sqlcommon/contractapis_sql_test.go index 375768c332..1da2f2bfb6 100644 --- a/internal/database/sqlcommon/contractapis_sql_test.go +++ b/internal/database/sqlcommon/contractapis_sql_test.go @@ -22,10 +22,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/contractlisteners_sql.go b/internal/database/sqlcommon/contractlisteners_sql.go index 87a09d6541..fb04239464 100644 --- a/internal/database/sqlcommon/contractlisteners_sql.go +++ b/internal/database/sqlcommon/contractlisteners_sql.go @@ -22,13 +22,13 @@ import ( "fmt" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/contractlisteners_sql_test.go b/internal/database/sqlcommon/contractlisteners_sql_test.go index c2b2f79b92..cea35f00c7 100644 --- a/internal/database/sqlcommon/contractlisteners_sql_test.go +++ b/internal/database/sqlcommon/contractlisteners_sql_test.go @@ -24,9 +24,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/data_sql.go b/internal/database/sqlcommon/data_sql.go index fe63b4788c..123f5f283a 100644 --- a/internal/database/sqlcommon/data_sql.go +++ b/internal/database/sqlcommon/data_sql.go @@ -22,14 +22,14 @@ import ( "strings" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/data_sql_test.go b/internal/database/sqlcommon/data_sql_test.go index 70cb255866..67e3927fc0 100644 --- a/internal/database/sqlcommon/data_sql_test.go +++ b/internal/database/sqlcommon/data_sql_test.go @@ -23,10 +23,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/datatype_sql.go b/internal/database/sqlcommon/datatype_sql.go index 31aa8ae314..adac50ea87 100644 --- a/internal/database/sqlcommon/datatype_sql.go +++ b/internal/database/sqlcommon/datatype_sql.go @@ -22,13 +22,13 @@ import ( "fmt" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/datatype_sql_test.go b/internal/database/sqlcommon/datatype_sql_test.go index cca132d69e..15a750649b 100644 --- a/internal/database/sqlcommon/datatype_sql_test.go +++ b/internal/database/sqlcommon/datatype_sql_test.go @@ -23,10 +23,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/event_sql.go b/internal/database/sqlcommon/event_sql.go index f0c63f4fdf..802be87291 100644 --- a/internal/database/sqlcommon/event_sql.go +++ b/internal/database/sqlcommon/event_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/event_sql_test.go b/internal/database/sqlcommon/event_sql_test.go index 06d74a0c7d..bf5c7e4be1 100644 --- a/internal/database/sqlcommon/event_sql_test.go +++ b/internal/database/sqlcommon/event_sql_test.go @@ -24,9 +24,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/ffi_errors_sql.go b/internal/database/sqlcommon/ffi_errors_sql.go index 9f40815f11..28d61a95f4 100644 --- a/internal/database/sqlcommon/ffi_errors_sql.go +++ b/internal/database/sqlcommon/ffi_errors_sql.go @@ -21,12 +21,12 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/ffi_errors_sql_test.go b/internal/database/sqlcommon/ffi_errors_sql_test.go index 75def26082..f86e01af5a 100644 --- a/internal/database/sqlcommon/ffi_errors_sql_test.go +++ b/internal/database/sqlcommon/ffi_errors_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/ffi_events_sql.go b/internal/database/sqlcommon/ffi_events_sql.go index 9e741c62f3..e4578c8b62 100644 --- a/internal/database/sqlcommon/ffi_events_sql.go +++ b/internal/database/sqlcommon/ffi_events_sql.go @@ -21,13 +21,13 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/ffi_events_sql_test.go b/internal/database/sqlcommon/ffi_events_sql_test.go index 355bf5ce2c..20b754cd1f 100644 --- a/internal/database/sqlcommon/ffi_events_sql_test.go +++ b/internal/database/sqlcommon/ffi_events_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/ffi_methods_sql.go b/internal/database/sqlcommon/ffi_methods_sql.go index 7ad284d0a9..48bd930a2a 100644 --- a/internal/database/sqlcommon/ffi_methods_sql.go +++ b/internal/database/sqlcommon/ffi_methods_sql.go @@ -21,13 +21,13 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/ffi_methods_sql_test.go b/internal/database/sqlcommon/ffi_methods_sql_test.go index d51ded9b21..3170ee63c4 100644 --- a/internal/database/sqlcommon/ffi_methods_sql_test.go +++ b/internal/database/sqlcommon/ffi_methods_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/ffi_sql.go b/internal/database/sqlcommon/ffi_sql.go index 34115a5f2e..0c8e62faa8 100644 --- a/internal/database/sqlcommon/ffi_sql.go +++ b/internal/database/sqlcommon/ffi_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/ffi_sql_test.go b/internal/database/sqlcommon/ffi_sql_test.go index a620f4749a..811a4199b4 100644 --- a/internal/database/sqlcommon/ffi_sql_test.go +++ b/internal/database/sqlcommon/ffi_sql_test.go @@ -22,10 +22,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/group_sql.go b/internal/database/sqlcommon/group_sql.go index fec8173e41..21cfa50d4d 100644 --- a/internal/database/sqlcommon/group_sql.go +++ b/internal/database/sqlcommon/group_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/group_sql_test.go b/internal/database/sqlcommon/group_sql_test.go index 44948b462a..27c9f3913a 100644 --- a/internal/database/sqlcommon/group_sql_test.go +++ b/internal/database/sqlcommon/group_sql_test.go @@ -23,10 +23,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/identity_sql.go b/internal/database/sqlcommon/identity_sql.go index 3a043483ae..5a315a4423 100644 --- a/internal/database/sqlcommon/identity_sql.go +++ b/internal/database/sqlcommon/identity_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/identity_sql_test.go b/internal/database/sqlcommon/identity_sql_test.go index 75d7bef336..e8cef323f2 100644 --- a/internal/database/sqlcommon/identity_sql_test.go +++ b/internal/database/sqlcommon/identity_sql_test.go @@ -23,10 +23,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/message_sql.go b/internal/database/sqlcommon/message_sql.go index f8df556450..649eb144f4 100644 --- a/internal/database/sqlcommon/message_sql.go +++ b/internal/database/sqlcommon/message_sql.go @@ -22,14 +22,14 @@ import ( "fmt" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/message_sql_test.go b/internal/database/sqlcommon/message_sql_test.go index 84df7cfed3..972f203dc1 100644 --- a/internal/database/sqlcommon/message_sql_test.go +++ b/internal/database/sqlcommon/message_sql_test.go @@ -24,10 +24,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/namespace_sql.go b/internal/database/sqlcommon/namespace_sql.go index 3ad5b9c989..c3575baf44 100644 --- a/internal/database/sqlcommon/namespace_sql.go +++ b/internal/database/sqlcommon/namespace_sql.go @@ -21,10 +21,10 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var ( diff --git a/internal/database/sqlcommon/namespace_sql_test.go b/internal/database/sqlcommon/namespace_sql_test.go index e7e5bac8d1..1a75391696 100644 --- a/internal/database/sqlcommon/namespace_sql_test.go +++ b/internal/database/sqlcommon/namespace_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/nextpin_sql.go b/internal/database/sqlcommon/nextpin_sql.go index 0c484b724d..a6fa2eae8c 100644 --- a/internal/database/sqlcommon/nextpin_sql.go +++ b/internal/database/sqlcommon/nextpin_sql.go @@ -21,11 +21,11 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var ( diff --git a/internal/database/sqlcommon/nextpin_sql_test.go b/internal/database/sqlcommon/nextpin_sql_test.go index 2ba6ee302b..42805d3f62 100644 --- a/internal/database/sqlcommon/nextpin_sql_test.go +++ b/internal/database/sqlcommon/nextpin_sql_test.go @@ -23,10 +23,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/nonce_sql.go b/internal/database/sqlcommon/nonce_sql.go index f101034abb..a029a64474 100644 --- a/internal/database/sqlcommon/nonce_sql.go +++ b/internal/database/sqlcommon/nonce_sql.go @@ -21,12 +21,12 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var ( diff --git a/internal/database/sqlcommon/nonce_sql_test.go b/internal/database/sqlcommon/nonce_sql_test.go index e24543d4ff..684975fa56 100644 --- a/internal/database/sqlcommon/nonce_sql_test.go +++ b/internal/database/sqlcommon/nonce_sql_test.go @@ -23,10 +23,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/offset_sql.go b/internal/database/sqlcommon/offset_sql.go index bbd1c329f7..74800ddc71 100644 --- a/internal/database/sqlcommon/offset_sql.go +++ b/internal/database/sqlcommon/offset_sql.go @@ -21,11 +21,11 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var ( diff --git a/internal/database/sqlcommon/offset_sql_test.go b/internal/database/sqlcommon/offset_sql_test.go index 38a19b342f..bdf737fb4a 100644 --- a/internal/database/sqlcommon/offset_sql_test.go +++ b/internal/database/sqlcommon/offset_sql_test.go @@ -25,10 +25,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/operation_sql.go b/internal/database/sqlcommon/operation_sql.go index 78c45f7faa..04574c75c7 100644 --- a/internal/database/sqlcommon/operation_sql.go +++ b/internal/database/sqlcommon/operation_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/operation_sql_test.go b/internal/database/sqlcommon/operation_sql_test.go index 0d9fc1c5e8..dfa4bd9e33 100644 --- a/internal/database/sqlcommon/operation_sql_test.go +++ b/internal/database/sqlcommon/operation_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/pin_sql.go b/internal/database/sqlcommon/pin_sql.go index bd61079b61..e5ba3f7e10 100644 --- a/internal/database/sqlcommon/pin_sql.go +++ b/internal/database/sqlcommon/pin_sql.go @@ -21,13 +21,13 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/pin_sql_test.go b/internal/database/sqlcommon/pin_sql_test.go index 17749cf90c..bb82405271 100644 --- a/internal/database/sqlcommon/pin_sql_test.go +++ b/internal/database/sqlcommon/pin_sql_test.go @@ -22,10 +22,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/provider_mock_test.go b/internal/database/sqlcommon/provider_mock_test.go index 38faa5eb98..b929aebcc7 100644 --- a/internal/database/sqlcommon/provider_mock_test.go +++ b/internal/database/sqlcommon/provider_mock_test.go @@ -24,11 +24,11 @@ import ( "github.com/DATA-DOG/go-sqlmock" sq "github.com/Masterminds/squirrel" migratedb "github.com/golang-migrate/migrate/v4/database" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/pkg/database" ) // testProvider uses the datadog mocking framework diff --git a/internal/database/sqlcommon/provider_sqlitego_test.go b/internal/database/sqlcommon/provider_sqlitego_test.go index 24a5014762..e0e8c38a51 100644 --- a/internal/database/sqlcommon/provider_sqlitego_test.go +++ b/internal/database/sqlcommon/provider_sqlitego_test.go @@ -26,10 +26,10 @@ import ( sq "github.com/Masterminds/squirrel" migratedb "github.com/golang-migrate/migrate/v4/database" "github.com/golang-migrate/migrate/v4/database/sqlite3" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" // Import SQLite driver diff --git a/internal/database/sqlcommon/sqlcommon.go b/internal/database/sqlcommon/sqlcommon.go index 93d7e32460..357fa76a5f 100644 --- a/internal/database/sqlcommon/sqlcommon.go +++ b/internal/database/sqlcommon/sqlcommon.go @@ -20,11 +20,11 @@ import ( "context" "sync" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" // Import migrate file source _ "github.com/golang-migrate/migrate/v4/source/file" diff --git a/internal/database/sqlcommon/sqlcommon_test.go b/internal/database/sqlcommon/sqlcommon_test.go index 02ab122f2f..32a8a5567c 100644 --- a/internal/database/sqlcommon/sqlcommon_test.go +++ b/internal/database/sqlcommon/sqlcommon_test.go @@ -23,10 +23,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/golang-migrate/migrate/v4" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) @@ -57,7 +57,7 @@ func TestTXConcurrency(t *testing.T) { // the well adopted CGO implementation. // When the e2e DB tests move to being able to be run against any database, this // test should be included. - // (additional refactor required - see https://github.com/hyperledger/firefly/issues/119) + // (additional refactor required - see https://github.com/hyperledger-firefly/firefly/issues/119) _, err := s.DB().Exec(` CREATE TABLE testconc ( seq INTEGER PRIMARY KEY AUTOINCREMENT, val VARCHAR(256) ); diff --git a/internal/database/sqlcommon/subscription_sql.go b/internal/database/sqlcommon/subscription_sql.go index 46b07ff84d..b341935428 100644 --- a/internal/database/sqlcommon/subscription_sql.go +++ b/internal/database/sqlcommon/subscription_sql.go @@ -22,13 +22,13 @@ import ( "fmt" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/subscription_sql_test.go b/internal/database/sqlcommon/subscription_sql_test.go index b7bf305ac6..79ad879412 100644 --- a/internal/database/sqlcommon/subscription_sql_test.go +++ b/internal/database/sqlcommon/subscription_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/tokenapproval_sql.go b/internal/database/sqlcommon/tokenapproval_sql.go index a529c1e97a..636d9c8c7c 100644 --- a/internal/database/sqlcommon/tokenapproval_sql.go +++ b/internal/database/sqlcommon/tokenapproval_sql.go @@ -21,13 +21,13 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/tokenapproval_sql_test.go b/internal/database/sqlcommon/tokenapproval_sql_test.go index fcb6122e06..cc44f78b8a 100644 --- a/internal/database/sqlcommon/tokenapproval_sql_test.go +++ b/internal/database/sqlcommon/tokenapproval_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/tokenbalance_sql.go b/internal/database/sqlcommon/tokenbalance_sql.go index 79834117c4..5afc89420d 100644 --- a/internal/database/sqlcommon/tokenbalance_sql.go +++ b/internal/database/sqlcommon/tokenbalance_sql.go @@ -21,13 +21,13 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) const tokenbalanceTable = "tokenbalance" diff --git a/internal/database/sqlcommon/tokenbalance_sql_test.go b/internal/database/sqlcommon/tokenbalance_sql_test.go index b2bdb6cd18..89977c91df 100644 --- a/internal/database/sqlcommon/tokenbalance_sql_test.go +++ b/internal/database/sqlcommon/tokenbalance_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlcommon/tokenpool_sql.go b/internal/database/sqlcommon/tokenpool_sql.go index fe52732132..2ce1579aca 100644 --- a/internal/database/sqlcommon/tokenpool_sql.go +++ b/internal/database/sqlcommon/tokenpool_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/tokenpool_sql_test.go b/internal/database/sqlcommon/tokenpool_sql_test.go index 7e96f5466e..43d8f78940 100644 --- a/internal/database/sqlcommon/tokenpool_sql_test.go +++ b/internal/database/sqlcommon/tokenpool_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/tokentransfer_sql.go b/internal/database/sqlcommon/tokentransfer_sql.go index 00ea407ef9..826e14fea8 100644 --- a/internal/database/sqlcommon/tokentransfer_sql.go +++ b/internal/database/sqlcommon/tokentransfer_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/tokentransfer_sql_test.go b/internal/database/sqlcommon/tokentransfer_sql_test.go index 7717c1527c..1806289b63 100644 --- a/internal/database/sqlcommon/tokentransfer_sql_test.go +++ b/internal/database/sqlcommon/tokentransfer_sql_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/transaction_sql.go b/internal/database/sqlcommon/transaction_sql.go index 647685b5be..578dde2dca 100644 --- a/internal/database/sqlcommon/transaction_sql.go +++ b/internal/database/sqlcommon/transaction_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/transaction_sql_test.go b/internal/database/sqlcommon/transaction_sql_test.go index e28efcdc81..2170b07c8b 100644 --- a/internal/database/sqlcommon/transaction_sql_test.go +++ b/internal/database/sqlcommon/transaction_sql_test.go @@ -24,9 +24,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/database/sqlcommon/verifier_sql.go b/internal/database/sqlcommon/verifier_sql.go index af3dd80956..da7e1ed194 100644 --- a/internal/database/sqlcommon/verifier_sql.go +++ b/internal/database/sqlcommon/verifier_sql.go @@ -21,14 +21,14 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) var ( diff --git a/internal/database/sqlcommon/verifier_sql_test.go b/internal/database/sqlcommon/verifier_sql_test.go index a6e70ee1e8..9dc6f8dfae 100644 --- a/internal/database/sqlcommon/verifier_sql_test.go +++ b/internal/database/sqlcommon/verifier_sql_test.go @@ -23,10 +23,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/sqlite3/config.go b/internal/database/sqlite3/config.go index 57540dba7f..011accba3d 100644 --- a/internal/database/sqlite3/config.go +++ b/internal/database/sqlite3/config.go @@ -20,8 +20,8 @@ package sqlite3 import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" ) const ( diff --git a/internal/database/sqlite3/sqlite3.go b/internal/database/sqlite3/sqlite3.go index 3c1680383a..2a0b4158a2 100644 --- a/internal/database/sqlite3/sqlite3.go +++ b/internal/database/sqlite3/sqlite3.go @@ -27,10 +27,10 @@ import ( sq "github.com/Masterminds/squirrel" migratedb "github.com/golang-migrate/migrate/v4/database" migratesqlite3 "github.com/golang-migrate/migrate/v4/database/sqlite3" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/dbsql" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/dbsql" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/pkg/database" // Import the derivation of SQLite3 CGO suported by golang-migrate "github.com/mattn/go-sqlite3" diff --git a/internal/database/sqlite3/sqlite3_test.go b/internal/database/sqlite3/sqlite3_test.go index 09edfc2dd1..69d958cb94 100644 --- a/internal/database/sqlite3/sqlite3_test.go +++ b/internal/database/sqlite3/sqlite3_test.go @@ -24,9 +24,9 @@ import ( "testing" sq "github.com/Masterminds/squirrel" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" "github.com/stretchr/testify/assert" ) diff --git a/internal/dataexchange/dxfactory/factory.go b/internal/dataexchange/dxfactory/factory.go index 66d7c104d5..cf97eeef31 100644 --- a/internal/dataexchange/dxfactory/factory.go +++ b/internal/dataexchange/dxfactory/factory.go @@ -19,12 +19,12 @@ package dxfactory import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/dataexchange/ffdx" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/dataexchange/ffdx" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) var ( diff --git a/internal/dataexchange/dxfactory/factory_test.go b/internal/dataexchange/dxfactory/factory_test.go index 989570a105..eab779d534 100644 --- a/internal/dataexchange/dxfactory/factory_test.go +++ b/internal/dataexchange/dxfactory/factory_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/internal/dataexchange/ffdx/config.go b/internal/dataexchange/ffdx/config.go index 776cce1f4e..002ceb8703 100644 --- a/internal/dataexchange/ffdx/config.go +++ b/internal/dataexchange/ffdx/config.go @@ -19,8 +19,8 @@ package ffdx import ( "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/wsclient" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/wsclient" ) const ( diff --git a/internal/dataexchange/ffdx/dxevent.go b/internal/dataexchange/ffdx/dxevent.go index 372e673183..1112170f25 100644 --- a/internal/dataexchange/ffdx/dxevent.go +++ b/internal/dataexchange/ffdx/dxevent.go @@ -20,12 +20,12 @@ import ( "encoding/json" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) type wsEvent struct { diff --git a/internal/dataexchange/ffdx/ffdx.go b/internal/dataexchange/ffdx/ffdx.go index 0000083008..0095180ba5 100644 --- a/internal/dataexchange/ffdx/ffdx.go +++ b/internal/dataexchange/ffdx/ffdx.go @@ -28,19 +28,19 @@ import ( "sync" "time" - "github.com/hyperledger/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/metrics" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) const DXIDSeparator = "/" @@ -177,7 +177,7 @@ func (h *FFDX) Name() string { } func (h *FFDX) Init(ctx context.Context, cancelCtx context.CancelFunc, config config.Section, metrics metrics.Manager) (err error) { - h.ctx = log.WithLogField(ctx, "dx", "https") + h.ctx = log.WithLogFields(ctx, "dx", "https") h.cancelCtx = cancelCtx h.ackChannel = make(chan *ack) h.callbacks = callbacks{ diff --git a/internal/dataexchange/ffdx/ffdx_test.go b/internal/dataexchange/ffdx/ffdx_test.go index 52bcecb7ae..905a4a3c89 100644 --- a/internal/dataexchange/ffdx/ffdx_test.go +++ b/internal/dataexchange/ffdx/ffdx_test.go @@ -29,22 +29,22 @@ import ( "testing" "time" - "github.com/hyperledger/firefly/internal/metrics" - - "github.com/hyperledger/firefly/mocks/metricsmocks" - - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/coremocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/wsmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/firefly/internal/metrics" + + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/coremocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/wsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/definitions/handler.go b/internal/definitions/handler.go index 462f0b0539..ac13caaeb7 100644 --- a/internal/definitions/handler.go +++ b/internal/definitions/handler.go @@ -21,18 +21,18 @@ import ( "encoding/json" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/assets" - "github.com/hyperledger/firefly/internal/contracts" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/assets" + "github.com/hyperledger-firefly/firefly/internal/contracts" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) type Handler interface { diff --git a/internal/definitions/handler_contracts.go b/internal/definitions/handler_contracts.go index f5f8df2a1b..f0fe13de27 100644 --- a/internal/definitions/handler_contracts.go +++ b/internal/definitions/handler_contracts.go @@ -20,12 +20,12 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (dh *definitionHandler) persistFFI(ctx context.Context, ffi *fftypes.FFI, isAuthor bool) (retry bool, err error) { diff --git a/internal/definitions/handler_contracts_test.go b/internal/definitions/handler_contracts_test.go index 6b59ba60ba..28d83449c1 100644 --- a/internal/definitions/handler_contracts_test.go +++ b/internal/definitions/handler_contracts_test.go @@ -22,9 +22,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/handler_datatype.go b/internal/definitions/handler_datatype.go index 6e99daa7bb..bab826ab75 100644 --- a/internal/definitions/handler_datatype.go +++ b/internal/definitions/handler_datatype.go @@ -19,10 +19,10 @@ package definitions import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (dh *definitionHandler) handleDatatypeBroadcast(ctx context.Context, state *core.BatchState, msg *core.Message, data core.DataArray, tx *fftypes.UUID) (HandlerResult, error) { diff --git a/internal/definitions/handler_datatype_test.go b/internal/definitions/handler_datatype_test.go index fc72fa1bf1..9bb721eaf9 100644 --- a/internal/definitions/handler_datatype_test.go +++ b/internal/definitions/handler_datatype_test.go @@ -22,8 +22,8 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/handler_identity_claim.go b/internal/definitions/handler_identity_claim.go index fcbfa16342..403acf8356 100644 --- a/internal/definitions/handler_identity_claim.go +++ b/internal/definitions/handler_identity_claim.go @@ -20,12 +20,12 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type identityMsgInfo struct { diff --git a/internal/definitions/handler_identity_claim_test.go b/internal/definitions/handler_identity_claim_test.go index a042c58115..dbe23ca913 100644 --- a/internal/definitions/handler_identity_claim_test.go +++ b/internal/definitions/handler_identity_claim_test.go @@ -23,9 +23,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/handler_identity_update.go b/internal/definitions/handler_identity_update.go index db9a65b9f0..80d6a7932c 100644 --- a/internal/definitions/handler_identity_update.go +++ b/internal/definitions/handler_identity_update.go @@ -19,12 +19,12 @@ package definitions import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type identityUpdateMsgInfo struct { diff --git a/internal/definitions/handler_identity_update_test.go b/internal/definitions/handler_identity_update_test.go index 9fa7db23ca..2d0d168016 100644 --- a/internal/definitions/handler_identity_update_test.go +++ b/internal/definitions/handler_identity_update_test.go @@ -23,9 +23,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/handler_identity_verification.go b/internal/definitions/handler_identity_verification.go index 4dda32677e..064db8ebf2 100644 --- a/internal/definitions/handler_identity_verification.go +++ b/internal/definitions/handler_identity_verification.go @@ -19,9 +19,9 @@ package definitions import ( "context" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (dh *definitionHandler) handleIdentityVerificationBroadcast(ctx context.Context, state *core.BatchState, verifyMsg *core.Message, data core.DataArray) (HandlerResult, error) { diff --git a/internal/definitions/handler_identity_verification_test.go b/internal/definitions/handler_identity_verification_test.go index 51a3e0c120..2021ad39a0 100644 --- a/internal/definitions/handler_identity_verification_test.go +++ b/internal/definitions/handler_identity_verification_test.go @@ -22,9 +22,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/handler_network_node.go b/internal/definitions/handler_network_node.go index dc70e0f1df..20ae0e8c33 100644 --- a/internal/definitions/handler_network_node.go +++ b/internal/definitions/handler_network_node.go @@ -19,9 +19,9 @@ package definitions import ( "context" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (dh *definitionHandler) handleDeprecatedNodeBroadcast(ctx context.Context, state *core.BatchState, msg *core.Message, data core.DataArray) (HandlerResult, error) { diff --git a/internal/definitions/handler_network_node_test.go b/internal/definitions/handler_network_node_test.go index d709efc594..dd0770af4e 100644 --- a/internal/definitions/handler_network_node_test.go +++ b/internal/definitions/handler_network_node_test.go @@ -22,9 +22,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/handler_network_org.go b/internal/definitions/handler_network_org.go index cd45d9e3fa..59676c66f1 100644 --- a/internal/definitions/handler_network_org.go +++ b/internal/definitions/handler_network_org.go @@ -19,9 +19,9 @@ package definitions import ( "context" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (dh *definitionHandler) handleDeprecatedOrganizationBroadcast(ctx context.Context, state *core.BatchState, msg *core.Message, data core.DataArray) (HandlerResult, error) { diff --git a/internal/definitions/handler_network_org_test.go b/internal/definitions/handler_network_org_test.go index 86a63dbca1..419a5e27d9 100644 --- a/internal/definitions/handler_network_org_test.go +++ b/internal/definitions/handler_network_org_test.go @@ -21,9 +21,9 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/handler_test.go b/internal/definitions/handler_test.go index 44559f0399..978494f055 100644 --- a/internal/definitions/handler_test.go +++ b/internal/definitions/handler_test.go @@ -21,15 +21,15 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/definitions/handler_tokenpool.go b/internal/definitions/handler_tokenpool.go index 048f59ceff..0a02649876 100644 --- a/internal/definitions/handler_tokenpool.go +++ b/internal/definitions/handler_tokenpool.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (dh *definitionHandler) handleTokenPoolBroadcast(ctx context.Context, state *core.BatchState, msg *core.Message, data core.DataArray) (HandlerResult, error) { diff --git a/internal/definitions/handler_tokenpool_test.go b/internal/definitions/handler_tokenpool_test.go index 37483c681a..d9efc3de22 100644 --- a/internal/definitions/handler_tokenpool_test.go +++ b/internal/definitions/handler_tokenpool_test.go @@ -22,9 +22,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/sender.go b/internal/definitions/sender.go index 70f3664095..cb4fd0858d 100644 --- a/internal/definitions/sender.go +++ b/internal/definitions/sender.go @@ -20,19 +20,19 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/assets" - "github.com/hyperledger/firefly/internal/broadcast" - "github.com/hyperledger/firefly/internal/contracts" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/assets" + "github.com/hyperledger-firefly/firefly/internal/broadcast" + "github.com/hyperledger-firefly/firefly/internal/contracts" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) type Sender interface { diff --git a/internal/definitions/sender_contracts.go b/internal/definitions/sender_contracts.go index 7264a9f926..a137ef5235 100644 --- a/internal/definitions/sender_contracts.go +++ b/internal/definitions/sender_contracts.go @@ -20,10 +20,10 @@ import ( "context" "errors" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (ds *definitionSender) DefineFFI(ctx context.Context, ffi *fftypes.FFI, waitConfirm bool) error { diff --git a/internal/definitions/sender_contracts_test.go b/internal/definitions/sender_contracts_test.go index b0717cc460..077b985cc6 100644 --- a/internal/definitions/sender_contracts_test.go +++ b/internal/definitions/sender_contracts_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/sender_datatype.go b/internal/definitions/sender_datatype.go index d34ee9e9e9..2af743cc86 100644 --- a/internal/definitions/sender_datatype.go +++ b/internal/definitions/sender_datatype.go @@ -19,10 +19,10 @@ package definitions import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (ds *definitionSender) DefineDatatype(ctx context.Context, datatype *core.Datatype, waitConfirm bool) error { diff --git a/internal/definitions/sender_datatype_test.go b/internal/definitions/sender_datatype_test.go index d770a20ca9..f5bcc03b94 100644 --- a/internal/definitions/sender_datatype_test.go +++ b/internal/definitions/sender_datatype_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/sender_identity.go b/internal/definitions/sender_identity.go index 02986684db..788060e1a2 100644 --- a/internal/definitions/sender_identity.go +++ b/internal/definitions/sender_identity.go @@ -19,8 +19,8 @@ package definitions import ( "context" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // ClaimIdentity is a special form of CreateDefinition where the signing identity does not need to have been pre-registered diff --git a/internal/definitions/sender_identity_test.go b/internal/definitions/sender_identity_test.go index 4564de6d29..125d3f3b99 100644 --- a/internal/definitions/sender_identity_test.go +++ b/internal/definitions/sender_identity_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/sender_test.go b/internal/definitions/sender_test.go index 261c5c3579..c0680484c6 100644 --- a/internal/definitions/sender_test.go +++ b/internal/definitions/sender_test.go @@ -21,16 +21,16 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/definitions/sender_tokenpool.go b/internal/definitions/sender_tokenpool.go index 1b02783c51..1860d29edf 100644 --- a/internal/definitions/sender_tokenpool.go +++ b/internal/definitions/sender_tokenpool.go @@ -20,10 +20,10 @@ import ( "context" "errors" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (ds *definitionSender) PublishTokenPool(ctx context.Context, poolNameOrID, networkName string, waitConfirm bool) (pool *core.TokenPool, err error) { diff --git a/internal/definitions/sender_tokenpool_test.go b/internal/definitions/sender_tokenpool_test.go index 8e15bfdb32..8374b23024 100644 --- a/internal/definitions/sender_tokenpool_test.go +++ b/internal/definitions/sender_tokenpool_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/aggregator.go b/internal/events/aggregator.go index 9f630663e0..fae5270fee 100644 --- a/internal/events/aggregator.go +++ b/internal/events/aggregator.go @@ -23,23 +23,23 @@ import ( "fmt" "strings" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/definitions" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/privatemessaging" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/definitions" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/privatemessaging" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) const ( @@ -98,7 +98,7 @@ func privatePinHash(topic string, group *fftypes.Bytes32, identity string, nonce func newAggregator(ctx context.Context, ns string, di database.Plugin, bi blockchain.Plugin, pm privatemessaging.Manager, sh definitions.Handler, im identity.Manager, dm data.Manager, en *eventNotifier, mm metrics.Manager, cacheManager cache.Manager) (*aggregator, error) { batchSize := config.GetUint64(coreconfig.EventAggregatorBatchSize) ag := &aggregator{ - ctx: log.WithLogField(ctx, "role", "aggregator"), + ctx: log.WithLogFields(ctx, "role", "aggregator"), namespace: ns, database: di, messaging: pm, diff --git a/internal/events/aggregator_batch_state.go b/internal/events/aggregator_batch_state.go index 710690c2b9..920338fd56 100644 --- a/internal/events/aggregator_batch_state.go +++ b/internal/events/aggregator_batch_state.go @@ -20,12 +20,12 @@ import ( "context" "database/sql/driver" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/privatemessaging" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/privatemessaging" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/sirupsen/logrus" ) diff --git a/internal/events/aggregator_batch_state_test.go b/internal/events/aggregator_batch_state_test.go index 4b8fb7a621..977d74ade2 100644 --- a/internal/events/aggregator_batch_state_test.go +++ b/internal/events/aggregator_batch_state_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/aggregator_rewind.go b/internal/events/aggregator_rewind.go index 6dc4a8d9f3..c4c676606c 100644 --- a/internal/events/aggregator_rewind.go +++ b/internal/events/aggregator_rewind.go @@ -22,14 +22,14 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type rewindType int @@ -68,7 +68,7 @@ type rewinder struct { func newRewinder(ag *aggregator) *rewinder { return &rewinder{ - ctx: log.WithLogField(ag.ctx, "role", "aggregator-rewind"), + ctx: log.WithLogFields(ag.ctx, "role", "aggregator-rewind"), aggregator: ag, database: ag.database, data: ag.data, diff --git a/internal/events/aggregator_rewind_test.go b/internal/events/aggregator_rewind_test.go index 7152d39cd0..6aa30c41e8 100644 --- a/internal/events/aggregator_rewind_test.go +++ b/internal/events/aggregator_rewind_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/aggregator_test.go b/internal/events/aggregator_test.go index 012dc0c934..b90de0ed82 100644 --- a/internal/events/aggregator_test.go +++ b/internal/events/aggregator_test.go @@ -24,24 +24,24 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/definitions" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/definitions" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/events/batch_pin_complete.go b/internal/events/batch_pin_complete.go index 7dccbe5cb1..071a0ede5f 100644 --- a/internal/events/batch_pin_complete.go +++ b/internal/events/batch_pin_complete.go @@ -19,10 +19,10 @@ package events import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // BatchPinComplete is called in-line with a particular ledger's stream of events, so while we diff --git a/internal/events/batch_pin_complete_test.go b/internal/events/batch_pin_complete_test.go index 75ee4c328c..4022893b21 100644 --- a/internal/events/batch_pin_complete_test.go +++ b/internal/events/batch_pin_complete_test.go @@ -22,10 +22,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/blob_receiver.go b/internal/events/blob_receiver.go index 9f1bbf77f2..db10d114cb 100644 --- a/internal/events/blob_receiver.go +++ b/internal/events/blob_receiver.go @@ -22,13 +22,13 @@ import ( "fmt" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type blobNotification struct { @@ -129,7 +129,7 @@ func (br *blobReceiver) stop() { func (br *blobReceiver) blobReceiverLoop(index int) { defer close(br.workersDone[index]) - ctx := log.WithLogField(br.ctx, "blobreceiver", fmt.Sprintf("brcvr_%.3d", index)) + ctx := log.WithLogFields(br.ctx, "blobreceiver", fmt.Sprintf("brcvr_%.3d", index)) var batch *blobReceiverBatch for !br.closed { diff --git a/internal/events/blob_receiver_test.go b/internal/events/blob_receiver_test.go index 55e3c93f41..01441f9166 100644 --- a/internal/events/blob_receiver_test.go +++ b/internal/events/blob_receiver_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/blockchain_event.go b/internal/events/blockchain_event.go index 337cadcff2..9edea9ef25 100644 --- a/internal/events/blockchain_event.go +++ b/internal/events/blockchain_event.go @@ -20,10 +20,10 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type eventBatchContext struct { diff --git a/internal/events/blockchain_event_test.go b/internal/events/blockchain_event_test.go index 4823eff538..5131d554c0 100644 --- a/internal/events/blockchain_event_test.go +++ b/internal/events/blockchain_event_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/bound_events_callbacks.go b/internal/events/bound_events_callbacks.go index 8d4c4ac1cc..42f33f2a1e 100644 --- a/internal/events/bound_events_callbacks.go +++ b/internal/events/bound_events_callbacks.go @@ -17,8 +17,8 @@ package events import ( - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/events" ) type boundCallbacks struct { diff --git a/internal/events/dx_callbacks.go b/internal/events/dx_callbacks.go index 1a83ed5dbf..9ee48ebc7b 100644 --- a/internal/events/dx_callbacks.go +++ b/internal/events/dx_callbacks.go @@ -20,11 +20,11 @@ import ( "context" "database/sql/driver" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) // Check that the sending data exchange peer corresponds to the node listed in the batch, diff --git a/internal/events/dx_callbacks_test.go b/internal/events/dx_callbacks_test.go index 751ce3e838..e618c4c01c 100644 --- a/internal/events/dx_callbacks_test.go +++ b/internal/events/dx_callbacks_test.go @@ -22,12 +22,12 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/eifactory/factory.go b/internal/events/eifactory/factory.go index d4a65e7ef6..3e9b6ee215 100644 --- a/internal/events/eifactory/factory.go +++ b/internal/events/eifactory/factory.go @@ -19,13 +19,13 @@ package eifactory import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/events/system" - "github.com/hyperledger/firefly/internal/events/webhooks" - "github.com/hyperledger/firefly/internal/events/websockets" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/events/system" + "github.com/hyperledger-firefly/firefly/internal/events/webhooks" + "github.com/hyperledger-firefly/firefly/internal/events/websockets" + "github.com/hyperledger-firefly/firefly/pkg/events" ) var plugins = []events.Plugin{ diff --git a/internal/events/eifactory/factory_test.go b/internal/events/eifactory/factory_test.go index fb964793e0..ec3575a4b6 100644 --- a/internal/events/eifactory/factory_test.go +++ b/internal/events/eifactory/factory_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/internal/events/event_dispatcher.go b/internal/events/event_dispatcher.go index 7e65a0aa59..5a58c0b1e7 100644 --- a/internal/events/event_dispatcher.go +++ b/internal/events/event_dispatcher.go @@ -22,21 +22,21 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/broadcast" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/privatemessaging" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/broadcast" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/privatemessaging" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/events" ) const ( @@ -90,7 +90,7 @@ func newEventDispatcher(ctx context.Context, enricher *eventEnricher, ei events. batch = *sub.definition.Options.Batch } ed := &eventDispatcher{ - ctx: log.WithLogField(log.WithLogField(ctx, + ctx: log.WithLogFields(log.WithLogFields(ctx, "role", fmt.Sprintf("ed[%s]", connID)), "sub", fmt.Sprintf("%s/%s:%s", sub.definition.ID, sub.definition.Namespace, sub.definition.Name)), enricher: enricher, diff --git a/internal/events/event_dispatcher_test.go b/internal/events/event_dispatcher_test.go index a752da0a2a..212b91df18 100644 --- a/internal/events/event_dispatcher_test.go +++ b/internal/events/event_dispatcher_test.go @@ -23,22 +23,22 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/eventsmocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/eventsmocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/events" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/event_enrich.go b/internal/events/event_enrich.go index 9b986ae00a..5343a09b6c 100644 --- a/internal/events/event_enrich.go +++ b/internal/events/event_enrich.go @@ -19,11 +19,11 @@ package events import ( "context" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type eventEnricher struct { diff --git a/internal/events/event_enrich_test.go b/internal/events/event_enrich_test.go index d98e7773f4..1341f9acb7 100644 --- a/internal/events/event_enrich_test.go +++ b/internal/events/event_enrich_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/event_manager.go b/internal/events/event_manager.go index 32ea04dce3..006f783e89 100644 --- a/internal/events/event_manager.go +++ b/internal/events/event_manager.go @@ -22,34 +22,34 @@ import ( "encoding/json" "strconv" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/assets" - "github.com/hyperledger/firefly/internal/broadcast" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/definitions" - "github.com/hyperledger/firefly/internal/events/eifactory" - "github.com/hyperledger/firefly/internal/events/system" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/multiparty" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/privatemessaging" - "github.com/hyperledger/firefly/internal/shareddownload" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" - "github.com/hyperledger/firefly/pkg/events" - "github.com/hyperledger/firefly/pkg/sharedstorage" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/assets" + "github.com/hyperledger-firefly/firefly/internal/broadcast" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/definitions" + "github.com/hyperledger-firefly/firefly/internal/events/eifactory" + "github.com/hyperledger-firefly/firefly/internal/events/system" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/multiparty" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/privatemessaging" + "github.com/hyperledger-firefly/firefly/internal/shareddownload" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/firefly/pkg/events" + "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" + "github.com/hyperledger-firefly/firefly/pkg/tokens" ) type EventManager interface { @@ -136,7 +136,7 @@ func NewEventManager(ctx context.Context, ns *core.Namespace, di database.Plugin } em := &eventManager{ - ctx: log.WithLogField(ctx, "role", "event-manager"), + ctx: log.WithLogFields(ctx, "role", "event-manager"), namespace: ns, database: di, txHelper: txHelper, diff --git a/internal/events/event_manager_test.go b/internal/events/event_manager_test.go index b1e4e16e62..0d858545ef 100644 --- a/internal/events/event_manager_test.go +++ b/internal/events/event_manager_test.go @@ -23,30 +23,30 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/events/system" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/mocks/eventsmocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/mocks/shareddownloadmocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/events/system" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/mocks/eventsmocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/mocks/shareddownloadmocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/events" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/events/event_notifier.go b/internal/events/event_notifier.go index 9ff39d0a4c..35590d09eb 100644 --- a/internal/events/event_notifier.go +++ b/internal/events/event_notifier.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) type eventNotifier struct { diff --git a/internal/events/event_poller.go b/internal/events/event_poller.go index 774e303788..91e1fee06a 100644 --- a/internal/events/event_poller.go +++ b/internal/events/event_poller.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type eventPoller struct { @@ -64,7 +64,7 @@ type eventPollerConf struct { func newEventPoller(ctx context.Context, di database.Plugin, en *eventNotifier, conf *eventPollerConf) *eventPoller { ep := &eventPoller{ - ctx: log.WithLogField(ctx, "role", fmt.Sprintf("ep[%s:%s]", conf.namespace, conf.offsetName)), + ctx: log.WithLogFields(ctx, "role", fmt.Sprintf("ep[%s:%s]", conf.namespace, conf.offsetName)), database: di, shoulderTaps: make(chan bool, 1), offsetCommitted: make(chan int64, 1), diff --git a/internal/events/event_poller_test.go b/internal/events/event_poller_test.go index 38c6947c32..aca3dc2a1a 100644 --- a/internal/events/event_poller_test.go +++ b/internal/events/event_poller_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/network_action.go b/internal/events/network_action.go index 4ce32aaede..435ba1980f 100644 --- a/internal/events/network_action.go +++ b/internal/events/network_action.go @@ -19,10 +19,10 @@ package events import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (em *eventManager) actionTerminate(ctx context.Context, location *fftypes.JSONAny, event *blockchain.Event) error { diff --git a/internal/events/network_action_test.go b/internal/events/network_action_test.go index f69208116a..aaa942a431 100644 --- a/internal/events/network_action_test.go +++ b/internal/events/network_action_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/offset_calc.go b/internal/events/offset_calc.go index 0762350956..5d5145a963 100644 --- a/internal/events/offset_calc.go +++ b/internal/events/offset_calc.go @@ -20,11 +20,11 @@ import ( "context" "strconv" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func calcFirstOffset(ctx context.Context, ns string, di database.Plugin, pfe *core.SubOptsFirstEvent) (firstOffset int64, err error) { diff --git a/internal/events/persist_batch.go b/internal/events/persist_batch.go index b4115d6868..68fa55d272 100644 --- a/internal/events/persist_batch.go +++ b/internal/events/persist_batch.go @@ -21,11 +21,11 @@ import ( "database/sql/driver" "errors" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type messageAndData struct { diff --git a/internal/events/persist_batch_test.go b/internal/events/persist_batch_test.go index 57d4934d39..ff40111adb 100644 --- a/internal/events/persist_batch_test.go +++ b/internal/events/persist_batch_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/reply_sender.go b/internal/events/reply_sender.go index 2c0d2c513f..f947e28111 100644 --- a/internal/events/reply_sender.go +++ b/internal/events/reply_sender.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (ed *eventDispatcher) sendReply(ctx context.Context, event *core.Event, reply *core.MessageInOut) { diff --git a/internal/events/reply_sender_test.go b/internal/events/reply_sender_test.go index ccb4ba3a4a..dbb07a76ec 100644 --- a/internal/events/reply_sender_test.go +++ b/internal/events/reply_sender_test.go @@ -21,11 +21,11 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/ss_callbacks.go b/internal/events/ss_callbacks.go index 53ee5b0010..3834c50b78 100644 --- a/internal/events/ss_callbacks.go +++ b/internal/events/ss_callbacks.go @@ -20,10 +20,10 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/sharedstorage" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" ) func (em *eventManager) SharedStorageBatchDownloaded(ss sharedstorage.Plugin, payloadRef string, data []byte) (*fftypes.UUID, error) { diff --git a/internal/events/ss_callbacks_test.go b/internal/events/ss_callbacks_test.go index de5ab01864..1c2312dd2e 100644 --- a/internal/events/ss_callbacks_test.go +++ b/internal/events/ss_callbacks_test.go @@ -21,10 +21,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/sharedstoragemocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/sharedstoragemocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/subscription_manager.go b/internal/events/subscription_manager.go index a11dcf2d6e..33597cfc07 100644 --- a/internal/events/subscription_manager.go +++ b/internal/events/subscription_manager.go @@ -22,20 +22,20 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/broadcast" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/privatemessaging" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/broadcast" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/privatemessaging" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/events" ) type subscription struct { diff --git a/internal/events/subscription_manager_test.go b/internal/events/subscription_manager_test.go index 008bdff925..6d072c3302 100644 --- a/internal/events/subscription_manager_test.go +++ b/internal/events/subscription_manager_test.go @@ -23,21 +23,21 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/eventsmocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/eventsmocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/events" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/system/config.go b/internal/events/system/config.go index 344cc6a6d7..92d0cdc064 100644 --- a/internal/events/system/config.go +++ b/internal/events/system/config.go @@ -17,7 +17,7 @@ package system import ( - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) const ( diff --git a/internal/events/system/events.go b/internal/events/system/events.go index c12c174114..30481f40e1 100644 --- a/internal/events/system/events.go +++ b/internal/events/system/events.go @@ -21,12 +21,12 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/events" ) const ( diff --git a/internal/events/system/events_test.go b/internal/events/system/events_test.go index 69f6c3bfb9..95a8aeb6d7 100644 --- a/internal/events/system/events_test.go +++ b/internal/events/system/events_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/eventsmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/eventsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/events" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/token_pool_created.go b/internal/events/token_pool_created.go index 2fb4c1ea2c..48510ca3ba 100644 --- a/internal/events/token_pool_created.go +++ b/internal/events/token_pool_created.go @@ -20,13 +20,13 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/tokens" ) func addPoolDetailsFromPlugin(ffPool *core.TokenPool, pluginPool *tokens.TokenPool) error { diff --git a/internal/events/token_pool_created_test.go b/internal/events/token_pool_created_test.go index 638182b23e..0959c7a2fe 100644 --- a/internal/events/token_pool_created_test.go +++ b/internal/events/token_pool_created_test.go @@ -20,12 +20,12 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/tokens" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/tokens_approved.go b/internal/events/tokens_approved.go index 272641f546..5728170442 100644 --- a/internal/events/tokens_approved.go +++ b/internal/events/tokens_approved.go @@ -19,12 +19,12 @@ package events import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/tokens" ) // Determine if this approval event should use a LocalID that was pre-assigned to an operation submitted by this node. diff --git a/internal/events/tokens_approved_test.go b/internal/events/tokens_approved_test.go index 1403e65b79..0951f8ea18 100644 --- a/internal/events/tokens_approved_test.go +++ b/internal/events/tokens_approved_test.go @@ -20,11 +20,11 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/tokens" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/tokens_transferred.go b/internal/events/tokens_transferred.go index c4048611f3..a2cd2617fa 100644 --- a/internal/events/tokens_transferred.go +++ b/internal/events/tokens_transferred.go @@ -19,11 +19,11 @@ package events import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/tokens" ) // Determine if this transfer event should use a LocalID that was pre-assigned to an operation submitted by this node. diff --git a/internal/events/tokens_transferred_test.go b/internal/events/tokens_transferred_test.go index 489f249875..92a5f61627 100644 --- a/internal/events/tokens_transferred_test.go +++ b/internal/events/tokens_transferred_test.go @@ -20,11 +20,11 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/tokens" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/events/webhooks/config.go b/internal/events/webhooks/config.go index 073aa6bcc0..2d2d05d253 100644 --- a/internal/events/webhooks/config.go +++ b/internal/events/webhooks/config.go @@ -17,8 +17,8 @@ package webhooks import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" ) func (wh *WebHooks) InitConfig(config config.Section) { diff --git a/internal/events/webhooks/webhooks.go b/internal/events/webhooks/webhooks.go index 49c932f898..781083ceae 100644 --- a/internal/events/webhooks/webhooks.go +++ b/internal/events/webhooks/webhooks.go @@ -29,14 +29,14 @@ import ( "time" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/events" ) type WebHooks struct { @@ -87,7 +87,7 @@ func (wh *WebHooks) Init(ctx context.Context, config config.Section) (err error) client := ffresty.NewWithConfig(ctx, *ffrestyConfig) *wh = WebHooks{ - ctx: log.WithLogField(ctx, "webhook", connID), + ctx: log.WithLogFields(ctx, "webhook", connID), capabilities: &events.Capabilities{ BatchDelivery: true, }, @@ -503,7 +503,7 @@ func (wh *WebHooks) doDelivery(ctx context.Context, connID string, reply bool, s } func (wh *WebHooks) DeliveryRequest(ctx context.Context, connID string, sub *core.Subscription, event *core.EventDelivery, data core.DataArray) error { - ctx = log.WithLogField(log.WithLogField(ctx, "webhook", wh.connID), "sub", sub.ID.String()) + ctx = log.WithLogFields(log.WithLogFields(ctx, "webhook", wh.connID), "sub", sub.ID.String()) reply := sub.Options.TransportOptions().GetBool("reply") if reply && event.Message != nil && event.Message.Header.CID != nil { // We cowardly refuse to dispatch a message that is itself a reply, as it's hard for users to @@ -543,7 +543,7 @@ func (wh *WebHooks) DeliveryRequest(ctx context.Context, connID string, sub *cor } func (wh *WebHooks) BatchDeliveryRequest(ctx context.Context, connID string, sub *core.Subscription, events []*core.CombinedEventDataDelivery) error { - ctx = log.WithLogField(log.WithLogField(ctx, "webhook", wh.connID), "sub", sub.ID.String()) + ctx = log.WithLogFields(log.WithLogFields(ctx, "webhook", wh.connID), "sub", sub.ID.String()) reply := sub.Options.TransportOptions().GetBool("reply") if reply { nonReplyEvents := []*core.CombinedEventDataDelivery{} diff --git a/internal/events/webhooks/webhooks_test.go b/internal/events/webhooks/webhooks_test.go index 0c22eba6c6..d2d931265e 100644 --- a/internal/events/webhooks/webhooks_test.go +++ b/internal/events/webhooks/webhooks_test.go @@ -37,15 +37,15 @@ import ( "time" "github.com/gorilla/mux" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - fflog "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/eventsmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + fflog "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/eventsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/events" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -1582,7 +1582,7 @@ func TestLoggingContextPreserved(t *testing.T) { Subscription: core.SubscriptionRef{ID: subID}, } - parentCtx := fflog.WithLogField(context.Background(), "httpReq", "req-123") + parentCtx := fflog.WithLogFields(context.Background(), "httpReq", "req-123") mcb := wh.callbacks.handlers["ns1"].(*eventsmocks.Callbacks) mcb.On("DeliveryResponse", mock.Anything, mock.MatchedBy(func(resp *core.EventDeliveryResponse) bool { diff --git a/internal/events/websockets/config.go b/internal/events/websockets/config.go index c5d8df776a..ff589cd859 100644 --- a/internal/events/websockets/config.go +++ b/internal/events/websockets/config.go @@ -16,7 +16,7 @@ package websockets -import "github.com/hyperledger/firefly-common/pkg/config" +import "github.com/hyperledger-firefly/common/pkg/config" const ( bufferSizeDefault = "16Kb" diff --git a/internal/events/websockets/websocket_connection.go b/internal/events/websockets/websocket_connection.go index 804b58d53f..071079dba9 100644 --- a/internal/events/websockets/websocket_connection.go +++ b/internal/events/websockets/websocket_connection.go @@ -27,11 +27,11 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type websocketStartedSub struct { @@ -64,7 +64,7 @@ type websocketConnection struct { func newConnection(pCtx context.Context, ws *WebSockets, wsConn *websocket.Conn, req *http.Request, auth core.Authorizer) *websocketConnection { connID := fftypes.NewUUID().String() - ctx := log.WithLogField(pCtx, "websocket", connID) + ctx := log.WithLogFields(pCtx, "websocket", connID) ctx, cancelCtx := context.WithCancel(ctx) wc := &websocketConnection{ ctx: ctx, diff --git a/internal/events/websockets/websockets.go b/internal/events/websockets/websockets.go index fe6dc9bf0e..91620a93ca 100644 --- a/internal/events/websockets/websockets.go +++ b/internal/events/websockets/websockets.go @@ -23,12 +23,12 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/events" ) type WebSocketsNamespaced interface { diff --git a/internal/events/websockets/websockets_test.go b/internal/events/websockets/websockets_test.go index cba25ebfad..e8bf3b8a7c 100644 --- a/internal/events/websockets/websockets_test.go +++ b/internal/events/websockets/websockets_test.go @@ -27,16 +27,16 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/eventsmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/eventsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/events" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/identity/identitymanager.go b/internal/identity/identitymanager.go index 78b5bbde39..e96a6a1230 100644 --- a/internal/identity/identitymanager.go +++ b/internal/identity/identitymanager.go @@ -21,16 +21,16 @@ import ( "fmt" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/multiparty" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/multiparty" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) const ( diff --git a/internal/identity/identitymanager_test.go b/internal/identity/identitymanager_test.go index 93565d9752..79a1a5f2a9 100644 --- a/internal/identity/identitymanager_test.go +++ b/internal/identity/identitymanager_test.go @@ -23,16 +23,16 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/multiparty" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/multiparty" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/identity/iifactory/factory.go b/internal/identity/iifactory/factory.go index ea78571e82..81ab080e55 100644 --- a/internal/identity/iifactory/factory.go +++ b/internal/identity/iifactory/factory.go @@ -19,12 +19,12 @@ package iifactory import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/identity/tbd" - "github.com/hyperledger/firefly/pkg/identity" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/identity/tbd" + "github.com/hyperledger-firefly/firefly/pkg/identity" ) var pluginsByName = map[string]func() identity.Plugin{ diff --git a/internal/identity/iifactory/factory_test.go b/internal/identity/iifactory/factory_test.go index 3110dbb65b..c12cca6142 100644 --- a/internal/identity/iifactory/factory_test.go +++ b/internal/identity/iifactory/factory_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/internal/identity/tbd/config.go b/internal/identity/tbd/config.go index 119812b8c7..210a86b104 100644 --- a/internal/identity/tbd/config.go +++ b/internal/identity/tbd/config.go @@ -17,7 +17,7 @@ package tbd import ( - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" ) func (tbd *TBD) InitConfig(config config.Section) { diff --git a/internal/identity/tbd/tbd.go b/internal/identity/tbd/tbd.go index 716b6eb19b..21ae23c555 100644 --- a/internal/identity/tbd/tbd.go +++ b/internal/identity/tbd/tbd.go @@ -19,8 +19,8 @@ package tbd import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/pkg/identity" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/pkg/identity" ) // TBD is a null implementation of the Identity Interface to avoid breaking configuration created with the previous "onchain" plugin diff --git a/internal/identity/tbd/tbd_test.go b/internal/identity/tbd/tbd_test.go index c9412e2ce7..d82db3df00 100644 --- a/internal/identity/tbd/tbd_test.go +++ b/internal/identity/tbd/tbd_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/mocks/identitymocks" - "github.com/hyperledger/firefly/pkg/identity" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/mocks/identitymocks" + "github.com/hyperledger-firefly/firefly/pkg/identity" "github.com/stretchr/testify/assert" ) diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go index 8c1e056a2f..4063082685 100644 --- a/internal/metrics/metrics.go +++ b/internal/metrics/metrics.go @@ -21,10 +21,10 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var mutex = &sync.Mutex{} diff --git a/internal/metrics/metrics_test.go b/internal/metrics/metrics_test.go index caa0e4c110..21aee2e211 100644 --- a/internal/metrics/metrics_test.go +++ b/internal/metrics/metrics_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" diff --git a/internal/multiparty/manager.go b/internal/multiparty/manager.go index d1ffd058b5..7827637d7d 100644 --- a/internal/multiparty/manager.go +++ b/internal/multiparty/manager.go @@ -20,16 +20,16 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type Manager interface { diff --git a/internal/multiparty/manager_test.go b/internal/multiparty/manager_test.go index 1a4ebefe9c..09b0716bed 100644 --- a/internal/multiparty/manager_test.go +++ b/internal/multiparty/manager_test.go @@ -22,16 +22,16 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/multiparty/operations.go b/internal/multiparty/operations.go index 945e7aca27..7e85fc4983 100644 --- a/internal/multiparty/operations.go +++ b/internal/multiparty/operations.go @@ -19,13 +19,13 @@ package multiparty import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type networkActionData struct { diff --git a/internal/multiparty/operations_test.go b/internal/multiparty/operations_test.go index b7ee65f099..daeaceacea 100644 --- a/internal/multiparty/operations_test.go +++ b/internal/multiparty/operations_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/namespace/config.go b/internal/namespace/config.go index 7345b1a19b..31704d4db7 100644 --- a/internal/namespace/config.go +++ b/internal/namespace/config.go @@ -17,18 +17,18 @@ package namespace import ( - "github.com/hyperledger/firefly-common/pkg/auth/authfactory" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly/internal/blockchain/bifactory" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/database/difactory" - "github.com/hyperledger/firefly/internal/dataexchange/dxfactory" - "github.com/hyperledger/firefly/internal/events/eifactory" - "github.com/hyperledger/firefly/internal/identity/iifactory" - "github.com/hyperledger/firefly/internal/sharedstorage/ssfactory" - "github.com/hyperledger/firefly/internal/tokens/tifactory" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/auth/authfactory" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/firefly/internal/blockchain/bifactory" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/database/difactory" + "github.com/hyperledger-firefly/firefly/internal/dataexchange/dxfactory" + "github.com/hyperledger-firefly/firefly/internal/events/eifactory" + "github.com/hyperledger-firefly/firefly/internal/identity/iifactory" + "github.com/hyperledger-firefly/firefly/internal/sharedstorage/ssfactory" + "github.com/hyperledger-firefly/firefly/internal/tokens/tifactory" + "github.com/hyperledger-firefly/firefly/pkg/core" ) const ( diff --git a/internal/namespace/configreload.go b/internal/namespace/configreload.go index 1556fb2f66..3dc71cceaf 100644 --- a/internal/namespace/configreload.go +++ b/internal/namespace/configreload.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" "github.com/spf13/viper" ) diff --git a/internal/namespace/configreload_test.go b/internal/namespace/configreload_test.go index 214fc7d0f1..1025ef5cb0 100644 --- a/internal/namespace/configreload_test.go +++ b/internal/namespace/configreload_test.go @@ -26,12 +26,12 @@ import ( "sync" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/sirupsen/logrus" "github.com/spf13/viper" "github.com/stretchr/testify/assert" diff --git a/internal/namespace/manager.go b/internal/namespace/manager.go index 962043c844..a0ed5554b7 100644 --- a/internal/namespace/manager.go +++ b/internal/namespace/manager.go @@ -24,36 +24,36 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/auth" - "github.com/hyperledger/firefly-common/pkg/auth/authfactory" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/blockchain/bifactory" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/database/difactory" - "github.com/hyperledger/firefly/internal/dataexchange/dxfactory" - "github.com/hyperledger/firefly/internal/events/eifactory" - "github.com/hyperledger/firefly/internal/events/system" - "github.com/hyperledger/firefly/internal/identity/iifactory" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/internal/sharedstorage/ssfactory" - "github.com/hyperledger/firefly/internal/spievents" - "github.com/hyperledger/firefly/internal/tokens/tifactory" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" - "github.com/hyperledger/firefly/pkg/events" - "github.com/hyperledger/firefly/pkg/identity" - "github.com/hyperledger/firefly/pkg/sharedstorage" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/auth" + "github.com/hyperledger-firefly/common/pkg/auth/authfactory" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/blockchain/bifactory" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/database/difactory" + "github.com/hyperledger-firefly/firefly/internal/dataexchange/dxfactory" + "github.com/hyperledger-firefly/firefly/internal/events/eifactory" + "github.com/hyperledger-firefly/firefly/internal/events/system" + "github.com/hyperledger-firefly/firefly/internal/identity/iifactory" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/internal/sharedstorage/ssfactory" + "github.com/hyperledger-firefly/firefly/internal/spievents" + "github.com/hyperledger-firefly/firefly/internal/tokens/tifactory" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/firefly/pkg/events" + "github.com/hyperledger-firefly/firefly/pkg/identity" + "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" + "github.com/hyperledger-firefly/firefly/pkg/tokens" "github.com/spf13/viper" ) diff --git a/internal/namespace/manager_test.go b/internal/namespace/manager_test.go index 86c63ff835..4c7f713dc4 100644 --- a/internal/namespace/manager_test.go +++ b/internal/namespace/manager_test.go @@ -33,43 +33,43 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/mocks/authmocks" - "github.com/hyperledger/firefly-common/pkg/auth" - "github.com/hyperledger/firefly-common/pkg/auth/authfactory" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/blockchain/bifactory" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/database/difactory" - "github.com/hyperledger/firefly/internal/dataexchange/dxfactory" - "github.com/hyperledger/firefly/internal/events/eifactory" - "github.com/hyperledger/firefly/internal/identity/iifactory" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/orchestrator" - "github.com/hyperledger/firefly/internal/sharedstorage/ssfactory" - "github.com/hyperledger/firefly/internal/tokens/tifactory" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/eventsmocks" - "github.com/hyperledger/firefly/mocks/identitymocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/orchestratormocks" - "github.com/hyperledger/firefly/mocks/sharedstoragemocks" - "github.com/hyperledger/firefly/mocks/spieventsmocks" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" - "github.com/hyperledger/firefly/pkg/events" - "github.com/hyperledger/firefly/pkg/identity" - "github.com/hyperledger/firefly/pkg/sharedstorage" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/mocks/authmocks" + "github.com/hyperledger-firefly/common/pkg/auth" + "github.com/hyperledger-firefly/common/pkg/auth/authfactory" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/blockchain/bifactory" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/database/difactory" + "github.com/hyperledger-firefly/firefly/internal/dataexchange/dxfactory" + "github.com/hyperledger-firefly/firefly/internal/events/eifactory" + "github.com/hyperledger-firefly/firefly/internal/identity/iifactory" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/orchestrator" + "github.com/hyperledger-firefly/firefly/internal/sharedstorage/ssfactory" + "github.com/hyperledger-firefly/firefly/internal/tokens/tifactory" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/eventsmocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/orchestratormocks" + "github.com/hyperledger-firefly/firefly/mocks/sharedstoragemocks" + "github.com/hyperledger-firefly/firefly/mocks/spieventsmocks" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/firefly/pkg/events" + "github.com/hyperledger-firefly/firefly/pkg/identity" + "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" + "github.com/hyperledger-firefly/firefly/pkg/tokens" "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/namespace/persistence_events.go b/internal/namespace/persistence_events.go index 05b597443d..58435d88e5 100644 --- a/internal/namespace/persistence_events.go +++ b/internal/namespace/persistence_events.go @@ -17,9 +17,9 @@ package namespace import ( - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (nm *namespaceManager) OrderedUUIDCollectionNSEvent(resType database.OrderedUUIDCollectionNS, eventType core.ChangeEventType, ns string, id *fftypes.UUID, sequence int64) { diff --git a/internal/namespace/persistence_events_test.go b/internal/namespace/persistence_events_test.go index 081322eaef..4652a9c58d 100644 --- a/internal/namespace/persistence_events_test.go +++ b/internal/namespace/persistence_events_test.go @@ -19,10 +19,10 @@ package namespace import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/spieventsmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/spieventsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/mock" ) diff --git a/internal/networkmap/check_node_test.go b/internal/networkmap/check_node_test.go index 3955b45f21..bb6bcdda6a 100644 --- a/internal/networkmap/check_node_test.go +++ b/internal/networkmap/check_node_test.go @@ -21,10 +21,10 @@ import ( "errors" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/networkmap/data_query.go b/internal/networkmap/data_query.go index fd6194790b..7ee7dd6788 100644 --- a/internal/networkmap/data_query.go +++ b/internal/networkmap/data_query.go @@ -20,13 +20,13 @@ import ( "context" "database/sql/driver" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (nm *networkMap) GetOrganizationByNameOrID(ctx context.Context, nameOrID string) (org *core.Identity, err error) { diff --git a/internal/networkmap/data_query_test.go b/internal/networkmap/data_query_test.go index 4c82205444..d3b6b268ec 100644 --- a/internal/networkmap/data_query_test.go +++ b/internal/networkmap/data_query_test.go @@ -20,11 +20,11 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/networkmap/did.go b/internal/networkmap/did.go index b52f290cdb..49d60b7533 100644 --- a/internal/networkmap/did.go +++ b/internal/networkmap/did.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) // DIDDocument - see https://www.w3.org/TR/did-core/#core-properties diff --git a/internal/networkmap/did_test.go b/internal/networkmap/did_test.go index 8ac97b2cce..37401ae4b3 100644 --- a/internal/networkmap/did_test.go +++ b/internal/networkmap/did_test.go @@ -20,10 +20,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/networkmap/manager.go b/internal/networkmap/manager.go index 364c0a6a07..9afd5b9392 100644 --- a/internal/networkmap/manager.go +++ b/internal/networkmap/manager.go @@ -19,16 +19,16 @@ package networkmap import ( "context" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/definitions" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/multiparty" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/definitions" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/multiparty" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) type Manager interface { diff --git a/internal/networkmap/manager_test.go b/internal/networkmap/manager_test.go index 204bc5f622..34e7be31ba 100644 --- a/internal/networkmap/manager_test.go +++ b/internal/networkmap/manager_test.go @@ -20,13 +20,13 @@ import ( "context" "testing" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" "github.com/stretchr/testify/assert" ) diff --git a/internal/networkmap/register_identity.go b/internal/networkmap/register_identity.go index 3fef6c74f6..24eda69b84 100644 --- a/internal/networkmap/register_identity.go +++ b/internal/networkmap/register_identity.go @@ -19,10 +19,10 @@ package networkmap import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (nm *networkMap) RegisterIdentity(ctx context.Context, dto *core.IdentityCreateDTO, waitConfirm bool) (identity *core.Identity, err error) { diff --git a/internal/networkmap/register_identity_test.go b/internal/networkmap/register_identity_test.go index c75b23fabc..96b7081402 100644 --- a/internal/networkmap/register_identity_test.go +++ b/internal/networkmap/register_identity_test.go @@ -21,12 +21,12 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/networkmap/register_node.go b/internal/networkmap/register_node.go index e7850ff403..4336adad5b 100644 --- a/internal/networkmap/register_node.go +++ b/internal/networkmap/register_node.go @@ -19,9 +19,9 @@ package networkmap import ( "context" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (nm *networkMap) RegisterNode(ctx context.Context, waitConfirm bool) (identity *core.Identity, err error) { diff --git a/internal/networkmap/register_node_test.go b/internal/networkmap/register_node_test.go index 4789833e2f..8eb64b0628 100644 --- a/internal/networkmap/register_node_test.go +++ b/internal/networkmap/register_node_test.go @@ -20,13 +20,13 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/multiparty" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/multiparty" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/networkmap/register_org.go b/internal/networkmap/register_org.go index 0f307f4dd8..1e8e8e89c7 100644 --- a/internal/networkmap/register_org.go +++ b/internal/networkmap/register_org.go @@ -19,9 +19,9 @@ package networkmap import ( "context" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // RegisterNodeOrganization is a convenience helper to register the org configured on the node, without any extra info diff --git a/internal/networkmap/register_org_test.go b/internal/networkmap/register_org_test.go index fdc84ca720..945aa4e489 100644 --- a/internal/networkmap/register_org_test.go +++ b/internal/networkmap/register_org_test.go @@ -21,12 +21,12 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/multiparty" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/multiparty" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/networkmap/update_identity.go b/internal/networkmap/update_identity.go index af1f7c9df0..d441af1b42 100644 --- a/internal/networkmap/update_identity.go +++ b/internal/networkmap/update_identity.go @@ -19,10 +19,10 @@ package networkmap import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (nm *networkMap) UpdateIdentity(ctx context.Context, uuidStr string, dto *core.IdentityUpdateDTO, waitConfirm bool) (identity *core.Identity, err error) { diff --git a/internal/networkmap/update_identity_test.go b/internal/networkmap/update_identity_test.go index c19977a6e2..bc03d91dc5 100644 --- a/internal/networkmap/update_identity_test.go +++ b/internal/networkmap/update_identity_test.go @@ -20,10 +20,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/operations/context.go b/internal/operations/context.go index d31a05f70e..11bc1a14d3 100644 --- a/internal/operations/context.go +++ b/internal/operations/context.go @@ -20,10 +20,10 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type operationContextKey struct{} diff --git a/internal/operations/context_test.go b/internal/operations/context_test.go index 122c0b82d9..9aa59eb7a1 100644 --- a/internal/operations/context_test.go +++ b/internal/operations/context_test.go @@ -20,10 +20,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/operations/manager.go b/internal/operations/manager.go index 1c9c1ae27d..fa74d0e943 100644 --- a/internal/operations/manager.go +++ b/internal/operations/manager.go @@ -21,15 +21,15 @@ import ( "database/sql/driver" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type OperationHandler interface { diff --git a/internal/operations/manager_test.go b/internal/operations/manager_test.go index 2be14fdc1b..0dd2febca1 100644 --- a/internal/operations/manager_test.go +++ b/internal/operations/manager_test.go @@ -22,17 +22,17 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/operations/operation_updater.go b/internal/operations/operation_updater.go index d0cf6b96c8..216daf0299 100644 --- a/internal/operations/operation_updater.go +++ b/internal/operations/operation_updater.go @@ -21,18 +21,18 @@ import ( "fmt" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/utils" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/utils" ) type operationUpdaterBatch struct { @@ -184,7 +184,7 @@ func (ou *operationUpdater) updaterLoop(index int) { defer close(ou.workersDone[index]) workQueue := ou.workQueues[index] - ctx := log.WithLogField(ou.ctx, "opupdater", fmt.Sprintf("opu_%.3d", index)) + ctx := log.WithLogFields(ou.ctx, "opupdater", fmt.Sprintf("opu_%.3d", index)) var batch *operationUpdaterBatch for !ou.closed { diff --git a/internal/operations/operation_updater_test.go b/internal/operations/operation_updater_test.go index 4f515928e1..31fb257d3f 100644 --- a/internal/operations/operation_updater_test.go +++ b/internal/operations/operation_updater_test.go @@ -22,17 +22,17 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/orchestrator/bound_callbacks.go b/internal/orchestrator/bound_callbacks.go index f9d2d2cc64..33b573948b 100644 --- a/internal/orchestrator/bound_callbacks.go +++ b/internal/orchestrator/bound_callbacks.go @@ -20,15 +20,15 @@ import ( "context" "sync" - "github.com/hyperledger/firefly-common/pkg/log" - - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/dataexchange" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/log" + + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/firefly/pkg/tokens" ) type boundCallbacks struct { diff --git a/internal/orchestrator/bound_callbacks_test.go b/internal/orchestrator/bound_callbacks_test.go index ddc728f5ab..3b0143b6c1 100644 --- a/internal/orchestrator/bound_callbacks_test.go +++ b/internal/orchestrator/bound_callbacks_test.go @@ -21,17 +21,17 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/eventmocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/sharedstoragemocks" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/eventmocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/sharedstoragemocks" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/tokens" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/orchestrator/chart.go b/internal/orchestrator/chart.go index fd1cc388fb..50e84a54f9 100644 --- a/internal/orchestrator/chart.go +++ b/internal/orchestrator/chart.go @@ -19,11 +19,11 @@ package orchestrator import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (or *orchestrator) getHistogramIntervals(startTime int64, endTime int64, numBuckets int64) (intervals []core.ChartHistogramInterval) { diff --git a/internal/orchestrator/chart_test.go b/internal/orchestrator/chart_test.go index 06e3887bfc..a2ab916427 100644 --- a/internal/orchestrator/chart_test.go +++ b/internal/orchestrator/chart_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/orchestrator/data_query.go b/internal/orchestrator/data_query.go index f24555ec80..e9750dd1fe 100644 --- a/internal/orchestrator/data_query.go +++ b/internal/orchestrator/data_query.go @@ -20,12 +20,12 @@ import ( "context" "database/sql/driver" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (or *orchestrator) GetNamespace(ctx context.Context) *core.Namespace { diff --git a/internal/orchestrator/data_query_test.go b/internal/orchestrator/data_query_test.go index 384484ac60..16812807ea 100644 --- a/internal/orchestrator/data_query_test.go +++ b/internal/orchestrator/data_query_test.go @@ -21,10 +21,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/orchestrator/message.go b/internal/orchestrator/message.go index cf5369e74d..a8d6c2d540 100644 --- a/internal/orchestrator/message.go +++ b/internal/orchestrator/message.go @@ -19,9 +19,9 @@ package orchestrator import ( "context" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (or *orchestrator) RequestReply(ctx context.Context, msg *core.MessageInOut) (reply *core.MessageInOut, err error) { diff --git a/internal/orchestrator/message_test.go b/internal/orchestrator/message_test.go index 363af2ecbc..3f9c96eb39 100644 --- a/internal/orchestrator/message_test.go +++ b/internal/orchestrator/message_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/orchestrator/orchestrator.go b/internal/orchestrator/orchestrator.go index 40d6e0a85c..a6cec37ad2 100644 --- a/internal/orchestrator/orchestrator.go +++ b/internal/orchestrator/orchestrator.go @@ -20,38 +20,38 @@ import ( "context" "sync" - "github.com/hyperledger/firefly-common/pkg/auth" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/assets" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/broadcast" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/contracts" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/definitions" - "github.com/hyperledger/firefly/internal/events" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/multiparty" - "github.com/hyperledger/firefly/internal/networkmap" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/privatemessaging" - "github.com/hyperledger/firefly/internal/shareddownload" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/internal/txwriter" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" - eventsplugin "github.com/hyperledger/firefly/pkg/events" - idplugin "github.com/hyperledger/firefly/pkg/identity" - "github.com/hyperledger/firefly/pkg/sharedstorage" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/auth" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/assets" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/broadcast" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/contracts" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/definitions" + "github.com/hyperledger-firefly/firefly/internal/events" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/multiparty" + "github.com/hyperledger-firefly/firefly/internal/networkmap" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/privatemessaging" + "github.com/hyperledger-firefly/firefly/internal/shareddownload" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/internal/txwriter" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" + eventsplugin "github.com/hyperledger-firefly/firefly/pkg/events" + idplugin "github.com/hyperledger-firefly/firefly/pkg/identity" + "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" + "github.com/hyperledger-firefly/firefly/pkg/tokens" ) // Orchestrator is the main interface behind the API, implementing the actions @@ -238,7 +238,7 @@ func (or *orchestrator) PreInit(ctx context.Context, cancelCtx context.CancelFun if or.namespace.NetworkName != "" && or.namespace.NetworkName != or.namespace.Name { namespaceLog += "->" + or.namespace.NetworkName } - or.ctx, or.cancelCtx = context.WithCancel(log.WithLogField(ctx, "ns", namespaceLog)) + or.ctx, or.cancelCtx = context.WithCancel(log.WithLogFields(ctx, "ns", namespaceLog)) or.initHandlers(or.ctx) } diff --git a/internal/orchestrator/orchestrator_test.go b/internal/orchestrator/orchestrator_test.go index 1a328a0ecf..942b7f68b9 100644 --- a/internal/orchestrator/orchestrator_test.go +++ b/internal/orchestrator/orchestrator_test.go @@ -23,38 +23,38 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/mocks/authmocks" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/mocks/assetmocks" - "github.com/hyperledger/firefly/mocks/batchmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/broadcastmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/contractmocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/definitionsmocks" - "github.com/hyperledger/firefly/mocks/eventmocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/identitymocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/networkmapmocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/privatemessagingmocks" - "github.com/hyperledger/firefly/mocks/shareddownloadmocks" - "github.com/hyperledger/firefly/mocks/sharedstoragemocks" - "github.com/hyperledger/firefly/mocks/spieventsmocks" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/mocks/txcommonmocks" - "github.com/hyperledger/firefly/mocks/txwritermocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/mocks/authmocks" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/mocks/assetmocks" + "github.com/hyperledger-firefly/firefly/mocks/batchmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/broadcastmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/contractmocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/definitionsmocks" + "github.com/hyperledger-firefly/firefly/mocks/eventmocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/networkmapmocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/privatemessagingmocks" + "github.com/hyperledger-firefly/firefly/mocks/shareddownloadmocks" + "github.com/hyperledger-firefly/firefly/mocks/sharedstoragemocks" + "github.com/hyperledger-firefly/firefly/mocks/spieventsmocks" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/mocks/txcommonmocks" + "github.com/hyperledger-firefly/firefly/mocks/txwritermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/events" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/orchestrator/persistence_events.go b/internal/orchestrator/persistence_events.go index fb95b6fa48..0c4f18de11 100644 --- a/internal/orchestrator/persistence_events.go +++ b/internal/orchestrator/persistence_events.go @@ -17,10 +17,10 @@ package orchestrator import ( - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (or *orchestrator) OrderedUUIDCollectionNSEvent(resType database.OrderedUUIDCollectionNS, eventType core.ChangeEventType, ns string, id *fftypes.UUID, sequence int64) { diff --git a/internal/orchestrator/persistence_events_test.go b/internal/orchestrator/persistence_events_test.go index 5dab7a16b6..3dc09a487e 100644 --- a/internal/orchestrator/persistence_events_test.go +++ b/internal/orchestrator/persistence_events_test.go @@ -20,11 +20,11 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/batchmocks" - "github.com/hyperledger/firefly/mocks/eventmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/batchmocks" + "github.com/hyperledger-firefly/firefly/mocks/eventmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func TestMessageCreated(t *testing.T) { diff --git a/internal/orchestrator/status.go b/internal/orchestrator/status.go index 03c3a84de2..d06398efaa 100644 --- a/internal/orchestrator/status.go +++ b/internal/orchestrator/status.go @@ -21,11 +21,11 @@ import ( "database/sql/driver" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (or *orchestrator) getPlugins() core.NamespaceStatusPlugins { diff --git a/internal/orchestrator/status_test.go b/internal/orchestrator/status_test.go index 91f2bd6d38..defce17476 100644 --- a/internal/orchestrator/status_test.go +++ b/internal/orchestrator/status_test.go @@ -20,10 +20,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/orchestrator/subscriptions.go b/internal/orchestrator/subscriptions.go index c0f9dadae7..50c7d71541 100644 --- a/internal/orchestrator/subscriptions.go +++ b/internal/orchestrator/subscriptions.go @@ -21,14 +21,14 @@ import ( "math" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/events/system" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/events/system" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (or *orchestrator) CreateSubscription(ctx context.Context, subDef *core.Subscription) (*core.Subscription, error) { diff --git a/internal/orchestrator/subscriptions_test.go b/internal/orchestrator/subscriptions_test.go index bee445506f..ceff104c8b 100644 --- a/internal/orchestrator/subscriptions_test.go +++ b/internal/orchestrator/subscriptions_test.go @@ -22,13 +22,13 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/events/system" - "github.com/hyperledger/firefly/internal/events/webhooks" - "github.com/hyperledger/firefly/mocks/eventmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/events" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/events/system" + "github.com/hyperledger-firefly/firefly/internal/events/webhooks" + "github.com/hyperledger-firefly/firefly/mocks/eventmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/events" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/orchestrator/txn_status.go b/internal/orchestrator/txn_status.go index 7741616bfe..2a05ced442 100644 --- a/internal/orchestrator/txn_status.go +++ b/internal/orchestrator/txn_status.go @@ -20,10 +20,10 @@ import ( "context" "sort" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func updateStatus(result *core.TransactionStatus, newStatus core.OpStatus) { diff --git a/internal/orchestrator/txn_status_test.go b/internal/orchestrator/txn_status_test.go index 3d14dc320a..3abf0b4315 100644 --- a/internal/orchestrator/txn_status_test.go +++ b/internal/orchestrator/txn_status_test.go @@ -23,8 +23,8 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/privatemessaging/groupmanager.go b/internal/privatemessaging/groupmanager.go index 2bf098dfa9..fdacba1bee 100644 --- a/internal/privatemessaging/groupmanager.go +++ b/internal/privatemessaging/groupmanager.go @@ -20,16 +20,16 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type GroupManager interface { diff --git a/internal/privatemessaging/groupmanager_test.go b/internal/privatemessaging/groupmanager_test.go index eaa84772f7..9fcd2f91dc 100644 --- a/internal/privatemessaging/groupmanager_test.go +++ b/internal/privatemessaging/groupmanager_test.go @@ -21,12 +21,12 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/privatemessaging/message.go b/internal/privatemessaging/message.go index a11a0fb488..60f8f5f413 100644 --- a/internal/privatemessaging/message.go +++ b/internal/privatemessaging/message.go @@ -19,13 +19,13 @@ package privatemessaging import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func (pm *privateMessaging) NewMessage(in *core.MessageInOut) syncasync.Sender { diff --git a/internal/privatemessaging/message_test.go b/internal/privatemessaging/message_test.go index be2084fd02..92eb421a0d 100644 --- a/internal/privatemessaging/message_test.go +++ b/internal/privatemessaging/message_test.go @@ -21,17 +21,17 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/privatemessaging/operations.go b/internal/privatemessaging/operations.go index c37638ccb7..899eea5f4e 100644 --- a/internal/privatemessaging/operations.go +++ b/internal/privatemessaging/operations.go @@ -20,11 +20,11 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type transferBlobData struct { diff --git a/internal/privatemessaging/operations_test.go b/internal/privatemessaging/operations_test.go index 212915c786..198905ffe7 100644 --- a/internal/privatemessaging/operations_test.go +++ b/internal/privatemessaging/operations_test.go @@ -20,12 +20,12 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/privatemessaging/privatemessaging.go b/internal/privatemessaging/privatemessaging.go index 886eafa11c..641226c88e 100644 --- a/internal/privatemessaging/privatemessaging.go +++ b/internal/privatemessaging/privatemessaging.go @@ -20,25 +20,25 @@ import ( "context" "sync" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/identity" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/internal/multiparty" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/syncasync" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/identity" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/multiparty" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/syncasync" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" ) const pinnedPrivateDispatcherName = "pinned_private" diff --git a/internal/privatemessaging/privatemessaging_test.go b/internal/privatemessaging/privatemessaging_test.go index 6606c3f220..71f2b87774 100644 --- a/internal/privatemessaging/privatemessaging_test.go +++ b/internal/privatemessaging/privatemessaging_test.go @@ -23,23 +23,23 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/batch" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/batchmocks" - "github.com/hyperledger/firefly/mocks/blockchainmocks" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/mocks/metricsmocks" - "github.com/hyperledger/firefly/mocks/multipartymocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/syncasyncmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/batch" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/batchmocks" + "github.com/hyperledger-firefly/firefly/mocks/blockchainmocks" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/mocks/metricsmocks" + "github.com/hyperledger-firefly/firefly/mocks/multipartymocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/syncasyncmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/privatemessaging/recipients.go b/internal/privatemessaging/recipients.go index 4c4c1a882a..13ecfc23fc 100644 --- a/internal/privatemessaging/recipients.go +++ b/internal/privatemessaging/recipients.go @@ -20,12 +20,12 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) func (pm *privateMessaging) resolveRecipientList(ctx context.Context, in *core.MessageInOut) error { diff --git a/internal/privatemessaging/recipients_test.go b/internal/privatemessaging/recipients_test.go index c6407466c2..4830d33d19 100644 --- a/internal/privatemessaging/recipients_test.go +++ b/internal/privatemessaging/recipients_test.go @@ -21,11 +21,11 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/identitymanagermocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/identitymanagermocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/reference/generate_reference_test.go b/internal/reference/generate_reference_test.go index c65a23a351..c94eded832 100644 --- a/internal/reference/generate_reference_test.go +++ b/internal/reference/generate_reference_test.go @@ -26,7 +26,7 @@ import ( "path/filepath" "testing" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "github.com/stretchr/testify/assert" "golang.org/x/text/language" ) diff --git a/internal/reference/reference.go b/internal/reference/reference.go index 8ef397e61f..c0859ce7ac 100644 --- a/internal/reference/reference.go +++ b/internal/reference/reference.go @@ -27,10 +27,10 @@ import ( "slices" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type TypeReferenceDoc struct { diff --git a/internal/reference/reference_test.go b/internal/reference/reference_test.go index 0d4b70cf21..3b9dd5065b 100644 --- a/internal/reference/reference_test.go +++ b/internal/reference/reference_test.go @@ -28,7 +28,7 @@ import ( "reflect" "testing" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" "github.com/stretchr/testify/assert" "golang.org/x/text/language" ) diff --git a/internal/shareddownload/download_manager.go b/internal/shareddownload/download_manager.go index 56cf25877d..1c8af091e6 100644 --- a/internal/shareddownload/download_manager.go +++ b/internal/shareddownload/download_manager.go @@ -22,17 +22,17 @@ import ( "math" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" - "github.com/hyperledger/firefly/pkg/dataexchange" - "github.com/hyperledger/firefly/pkg/sharedstorage" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" + "github.com/hyperledger-firefly/firefly/pkg/dataexchange" + "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" ) type Manager interface { diff --git a/internal/shareddownload/download_manager_test.go b/internal/shareddownload/download_manager_test.go index fd217ec9a0..af7a03ca80 100644 --- a/internal/shareddownload/download_manager_test.go +++ b/internal/shareddownload/download_manager_test.go @@ -24,17 +24,17 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/shareddownloadmocks" - "github.com/hyperledger/firefly/mocks/sharedstoragemocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/shareddownloadmocks" + "github.com/hyperledger-firefly/firefly/mocks/sharedstoragemocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/shareddownload/download_worker.go b/internal/shareddownload/download_worker.go index 68409aa9fe..baf821fdc0 100644 --- a/internal/shareddownload/download_worker.go +++ b/internal/shareddownload/download_worker.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type downloadWorker struct { @@ -32,7 +32,7 @@ type downloadWorker struct { func newDownloadWorker(dm *downloadManager, idx int) *downloadWorker { dw := &downloadWorker{ - ctx: log.WithLogField(dm.ctx, "downloadworker", fmt.Sprintf("dw_%.3d", idx)), + ctx: log.WithLogFields(dm.ctx, "downloadworker", fmt.Sprintf("dw_%.3d", idx)), done: make(chan struct{}), dm: dm, } diff --git a/internal/shareddownload/operations.go b/internal/shareddownload/operations.go index 94c8f2f9f2..9d192eb602 100644 --- a/internal/shareddownload/operations.go +++ b/internal/shareddownload/operations.go @@ -21,11 +21,11 @@ import ( "io" "github.com/docker/go-units" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type downloadBatchData struct { diff --git a/internal/shareddownload/operations_test.go b/internal/shareddownload/operations_test.go index 1977ced038..5876e04037 100644 --- a/internal/shareddownload/operations_test.go +++ b/internal/shareddownload/operations_test.go @@ -25,10 +25,10 @@ import ( "testing" "testing/iotest" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/dataexchangemocks" - "github.com/hyperledger/firefly/mocks/shareddownloadmocks" - "github.com/hyperledger/firefly/mocks/sharedstoragemocks" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/dataexchangemocks" + "github.com/hyperledger-firefly/firefly/mocks/shareddownloadmocks" + "github.com/hyperledger-firefly/firefly/mocks/sharedstoragemocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/sharedstorage/ipfs/config.go b/internal/sharedstorage/ipfs/config.go index 3cce08220a..b406363457 100644 --- a/internal/sharedstorage/ipfs/config.go +++ b/internal/sharedstorage/ipfs/config.go @@ -17,8 +17,8 @@ package ipfs import ( - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" ) const ( diff --git a/internal/sharedstorage/ipfs/ipfs.go b/internal/sharedstorage/ipfs/ipfs.go index bf10e75106..f58e032788 100644 --- a/internal/sharedstorage/ipfs/ipfs.go +++ b/internal/sharedstorage/ipfs/ipfs.go @@ -24,12 +24,12 @@ import ( "io" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/sharedstorage" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" ) type IPFS struct { @@ -51,7 +51,7 @@ func (i *IPFS) Name() string { func (i *IPFS) Init(ctx context.Context, config config.Section) (err error) { - i.ctx = log.WithLogField(ctx, "sharedstorage", "ipfs") + i.ctx = log.WithLogFields(ctx, "sharedstorage", "ipfs") apiConfig := config.SubSection(IPFSConfAPISubconf) if apiConfig.GetString(ffresty.HTTPConfigURL) == "" { diff --git a/internal/sharedstorage/ipfs/ipfs_test.go b/internal/sharedstorage/ipfs/ipfs_test.go index fa63c5d174..0b7850c573 100644 --- a/internal/sharedstorage/ipfs/ipfs_test.go +++ b/internal/sharedstorage/ipfs/ipfs_test.go @@ -24,12 +24,12 @@ import ( "net/http" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/sharedstoragemocks" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/sharedstoragemocks" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/internal/sharedstorage/ssfactory/factory.go b/internal/sharedstorage/ssfactory/factory.go index bf9f314f67..db0eaac8f1 100644 --- a/internal/sharedstorage/ssfactory/factory.go +++ b/internal/sharedstorage/ssfactory/factory.go @@ -19,12 +19,12 @@ package ssfactory import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/sharedstorage/ipfs" - "github.com/hyperledger/firefly/pkg/sharedstorage" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/sharedstorage/ipfs" + "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" ) var pluginsByName = map[string]func() sharedstorage.Plugin{ diff --git a/internal/sharedstorage/ssfactory/factory_test.go b/internal/sharedstorage/ssfactory/factory_test.go index 5013d4cf45..68febdc168 100644 --- a/internal/sharedstorage/ssfactory/factory_test.go +++ b/internal/sharedstorage/ssfactory/factory_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/internal/spievents/manager.go b/internal/spievents/manager.go index 2f4bb49a86..9fb944593e 100644 --- a/internal/spievents/manager.go +++ b/internal/spievents/manager.go @@ -23,10 +23,10 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type Manager interface { @@ -62,7 +62,7 @@ func NewAdminEventManager(ctx context.Context) Manager { blockedWarnInterval: config.GetDuration(coreconfig.SPIWebSocketBlockedWarnInterval), } ae.ctx, ae.cancelCtx = context.WithCancel( - log.WithLogField(ctx, "role", "change-event-manager"), + log.WithLogFields(ctx, "role", "change-event-manager"), ) return ae } diff --git a/internal/spievents/manager_test.go b/internal/spievents/manager_test.go index bbec947634..62bd2d9b32 100644 --- a/internal/spievents/manager_test.go +++ b/internal/spievents/manager_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/spievents/websockets.go b/internal/spievents/websockets.go index ac6fd272c2..7e04c9b2c5 100644 --- a/internal/spievents/websockets.go +++ b/internal/spievents/websockets.go @@ -25,9 +25,9 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type webSocket struct { @@ -49,7 +49,7 @@ type webSocket struct { func newWebSocket(ae *adminEventManager, wsConn *websocket.Conn) *webSocket { connID := fftypes.NewUUID().String() - ctx := log.WithLogField(ae.ctx, "admin.ws", connID) + ctx := log.WithLogFields(ae.ctx, "admin.ws", connID) ctx, cancelCtx := context.WithCancel(ctx) wc := &webSocket{ ctx: ctx, diff --git a/internal/spievents/websockets_test.go b/internal/spievents/websockets_test.go index 7af854f1d9..c3a9084768 100644 --- a/internal/spievents/websockets_test.go +++ b/internal/spievents/websockets_test.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/syncasync/sync_async_bridge.go b/internal/syncasync/sync_async_bridge.go index 6b7f31b20c..f38b14b898 100644 --- a/internal/syncasync/sync_async_bridge.go +++ b/internal/syncasync/sync_async_bridge.go @@ -23,15 +23,15 @@ import ( "sync" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/events/system" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/events/system" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) // Bridge translates synchronous (HTTP API) calls, into asynchronously sending a @@ -111,7 +111,7 @@ type syncAsyncBridge struct { func NewSyncAsyncBridge(ctx context.Context, ns string, di database.Plugin, dm data.Manager, om operations.Manager) Bridge { sa := &syncAsyncBridge{ - ctx: log.WithLogField(ctx, "role", "sync-async-bridge"), + ctx: log.WithLogFields(ctx, "role", "sync-async-bridge"), namespace: ns, database: di, data: dm, diff --git a/internal/syncasync/sync_async_bridge_test.go b/internal/syncasync/sync_async_bridge_test.go index 2949d7460c..59d5f26a5f 100644 --- a/internal/syncasync/sync_async_bridge_test.go +++ b/internal/syncasync/sync_async_bridge_test.go @@ -22,12 +22,12 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/mocks/operationmocks" - "github.com/hyperledger/firefly/mocks/systemeventmocks" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/mocks/operationmocks" + "github.com/hyperledger-firefly/firefly/mocks/systemeventmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/tokens/fftokens/config.go b/internal/tokens/fftokens/config.go index a2c42ea643..e100afdc71 100644 --- a/internal/tokens/fftokens/config.go +++ b/internal/tokens/fftokens/config.go @@ -19,8 +19,8 @@ package fftokens import ( "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/wsclient" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/wsclient" ) const ( diff --git a/internal/tokens/fftokens/fftokens.go b/internal/tokens/fftokens/fftokens.go index dd959c6cef..042d617195 100644 --- a/internal/tokens/fftokens/fftokens.go +++ b/internal/tokens/fftokens/fftokens.go @@ -24,19 +24,19 @@ import ( "sync" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly-signer/pkg/abi" - "github.com/hyperledger/firefly-signer/pkg/ffi2abi" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/tokens" + "github.com/hyperledger-firefly/signer/pkg/abi" + "github.com/hyperledger-firefly/signer/pkg/ffi2abi" ) type ConflictError struct { @@ -291,7 +291,7 @@ func (ft *FFTokens) ConnectorName() string { } func (ft *FFTokens) Init(ctx context.Context, cancelCtx context.CancelFunc, name string, config config.Section) (err error) { - ft.ctx = log.WithLogField(ctx, "proto", "fftokens") + ft.ctx = log.WithLogFields(ctx, "proto", "fftokens") ft.cancelCtx = cancelCtx ft.configuredName = name ft.capabilities = &tokens.Capabilities{} diff --git a/internal/tokens/fftokens/fftokens_test.go b/internal/tokens/fftokens/fftokens_test.go index 56d693998f..a016542e2e 100644 --- a/internal/tokens/fftokens/fftokens_test.go +++ b/internal/tokens/fftokens/fftokens_test.go @@ -27,19 +27,19 @@ import ( "testing" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffresty" - "github.com/hyperledger/firefly-common/pkg/fftls" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/retry" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/mocks/coremocks" - "github.com/hyperledger/firefly/mocks/tokenmocks" - "github.com/hyperledger/firefly/mocks/wsmocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffresty" + "github.com/hyperledger-firefly/common/pkg/fftls" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/retry" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/mocks/coremocks" + "github.com/hyperledger-firefly/firefly/mocks/tokenmocks" + "github.com/hyperledger-firefly/firefly/mocks/wsmocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/tokens" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/tokens/tifactory/factory.go b/internal/tokens/tifactory/factory.go index 1e2a6bc793..98baf51be1 100644 --- a/internal/tokens/tifactory/factory.go +++ b/internal/tokens/tifactory/factory.go @@ -19,12 +19,12 @@ package tifactory import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/tokens/fftokens" - "github.com/hyperledger/firefly/pkg/tokens" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/tokens/fftokens" + "github.com/hyperledger-firefly/firefly/pkg/tokens" ) var pluginsByName = map[string]func() tokens.Plugin{ diff --git a/internal/tokens/tifactory/factory_test.go b/internal/tokens/tifactory/factory_test.go index f1d1229321..2a2f87c5fb 100644 --- a/internal/tokens/tifactory/factory_test.go +++ b/internal/tokens/tifactory/factory_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/config" "github.com/stretchr/testify/assert" ) diff --git a/internal/txcommon/contract_inputs.go b/internal/txcommon/contract_inputs.go index 9b900f023c..38afe7928e 100644 --- a/internal/txcommon/contract_inputs.go +++ b/internal/txcommon/contract_inputs.go @@ -21,9 +21,9 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type BatchPinData struct { diff --git a/internal/txcommon/contract_inputs_test.go b/internal/txcommon/contract_inputs_test.go index 2650b24449..6266eb2d05 100644 --- a/internal/txcommon/contract_inputs_test.go +++ b/internal/txcommon/contract_inputs_test.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/txcommon/token_inputs.go b/internal/txcommon/token_inputs.go index f1ea41be43..273c1ee0b3 100644 --- a/internal/txcommon/token_inputs.go +++ b/internal/txcommon/token_inputs.go @@ -20,9 +20,9 @@ import ( "context" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/pkg/core" ) func AddTokenPoolCreateInputs(op *core.Operation, pool *core.TokenPool) (err error) { diff --git a/internal/txcommon/token_inputs_test.go b/internal/txcommon/token_inputs_test.go index 1f9293aaa9..3eb88402a4 100644 --- a/internal/txcommon/token_inputs_test.go +++ b/internal/txcommon/token_inputs_test.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" ) diff --git a/internal/txcommon/txcommon.go b/internal/txcommon/txcommon.go index f7560daf72..8c590c410b 100644 --- a/internal/txcommon/txcommon.go +++ b/internal/txcommon/txcommon.go @@ -21,16 +21,16 @@ import ( "database/sql/driver" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/data" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/data" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type Helper interface { diff --git a/internal/txcommon/txcommon_test.go b/internal/txcommon/txcommon_test.go index 903b0081a1..cfd012bc22 100644 --- a/internal/txcommon/txcommon_test.go +++ b/internal/txcommon/txcommon_test.go @@ -23,16 +23,16 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/mocks/cachemocks" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/mocks/cachemocks" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/txwriter/txwriter.go b/internal/txwriter/txwriter.go index 9367cb6074..fd1bac38d3 100644 --- a/internal/txwriter/txwriter.go +++ b/internal/txwriter/txwriter.go @@ -21,15 +21,15 @@ import ( "fmt" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" ) type Writer interface { @@ -140,7 +140,7 @@ func (tw *txWriter) Start() { func (tw *txWriter) writerLoop(writerIndex int) { defer close(tw.workersDone[writerIndex]) - ctx := log.WithLogField(tw.bgContext, "job", fmt.Sprintf("txwriter_%.3d", writerIndex)) + ctx := log.WithLogFields(tw.bgContext, "job", fmt.Sprintf("txwriter_%.3d", writerIndex)) var batchNumber int var batch *txWriterBatch for !tw.closed { @@ -173,7 +173,7 @@ func (tw *txWriter) writerLoop(writerIndex int) { } func (tw *txWriter) executeBatch(ctx context.Context, batch *txWriterBatch) { - ctx = log.WithLogField(ctx, "batch", batch.id) + ctx = log.WithLogFields(ctx, "batch", batch.id) err := tw.database.RunAsGroup(ctx, func(ctx context.Context) error { return tw.processBatch(ctx, batch) }) diff --git a/internal/txwriter/txwriter_test.go b/internal/txwriter/txwriter_test.go index 80fc41a674..8909ea3be4 100644 --- a/internal/txwriter/txwriter_test.go +++ b/internal/txwriter/txwriter_test.go @@ -21,17 +21,17 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/coreconfig" - "github.com/hyperledger/firefly/internal/database/sqlcommon" - "github.com/hyperledger/firefly/internal/operations" - "github.com/hyperledger/firefly/internal/txcommon" - "github.com/hyperledger/firefly/mocks/databasemocks" - "github.com/hyperledger/firefly/mocks/datamocks" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/pkg/database" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/coreconfig" + "github.com/hyperledger-firefly/firefly/internal/database/sqlcommon" + "github.com/hyperledger-firefly/firefly/internal/operations" + "github.com/hyperledger-firefly/firefly/internal/txcommon" + "github.com/hyperledger-firefly/firefly/mocks/databasemocks" + "github.com/hyperledger-firefly/firefly/mocks/datamocks" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/pkg/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/main.go b/main.go index b4e95d3a65..ce28171178 100644 --- a/main.go +++ b/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/hyperledger/firefly/cmd" + "github.com/hyperledger-firefly/firefly/cmd" ) func main() { diff --git a/manifest.json b/manifest.json index 13e5bd20c8..bd6419c90c 100644 --- a/manifest.json +++ b/manifest.json @@ -69,6 +69,6 @@ "release": "v1.3.3" }, "cli": { - "tag": "v1.4.0" + "tag": "main" } } diff --git a/manifestgen.sh b/manifestgen.sh index 9bbe903c43..e4769e53fb 100755 --- a/manifestgen.sh +++ b/manifestgen.sh @@ -87,7 +87,7 @@ do # Get the SHA of the downloaded image SHA=$(docker inspect --format='{{index .RepoDigests 0}}' ghcr.io/hyperledger-firefly/${SERVICES[$i]}:$TAG | cut -d ':' -f 2) # Get the tag / build number name of this image from its label - TAG_LABEL=$(docker inspect --format='{{index .Config.Labels "tag"}}' ghcr.io/hyperledger/firefly-${SERVICES[$i]}:$TAG) + TAG_LABEL=$(docker inspect --format='{{index .Config.Labels "tag"}}' ghcr.io/hyperledger-firefly/${SERVICES[$i]}:$TAG) # If the tag / build number wasn't set in the label, use whatever docker tag we fetched # This is done for backwards compatability, because not all images have labels yet diff --git a/mocks/apiservermocks/ffi_swagger_gen.go b/mocks/apiservermocks/ffi_swagger_gen.go index 8a6beb8f47..e2ceab1811 100644 --- a/mocks/apiservermocks/ffi_swagger_gen.go +++ b/mocks/apiservermocks/ffi_swagger_gen.go @@ -5,10 +5,10 @@ package apiservermocks import ( context "context" - ffapi "github.com/hyperledger/firefly-common/pkg/ffapi" - core "github.com/hyperledger/firefly/pkg/core" + ffapi "github.com/hyperledger-firefly/common/pkg/ffapi" + core "github.com/hyperledger-firefly/firefly/pkg/core" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/apiservermocks/server.go b/mocks/apiservermocks/server.go index 209e30aabc..55c0a85d2d 100644 --- a/mocks/apiservermocks/server.go +++ b/mocks/apiservermocks/server.go @@ -5,7 +5,7 @@ package apiservermocks import ( context "context" - namespace "github.com/hyperledger/firefly/internal/namespace" + namespace "github.com/hyperledger-firefly/firefly/internal/namespace" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/assetmocks/manager.go b/mocks/assetmocks/manager.go index 95390c40f2..30a1791d23 100644 --- a/mocks/assetmocks/manager.go +++ b/mocks/assetmocks/manager.go @@ -5,14 +5,14 @@ package assetmocks import ( context "context" - ffapi "github.com/hyperledger/firefly-common/pkg/ffapi" - core "github.com/hyperledger/firefly/pkg/core" + ffapi "github.com/hyperledger-firefly/common/pkg/ffapi" + core "github.com/hyperledger-firefly/firefly/pkg/core" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" - syncasync "github.com/hyperledger/firefly/internal/syncasync" + syncasync "github.com/hyperledger-firefly/firefly/internal/syncasync" ) // Manager is an autogenerated mock type for the Manager type diff --git a/mocks/batchmocks/manager.go b/mocks/batchmocks/manager.go index f0b548261f..f57ef4f1ab 100644 --- a/mocks/batchmocks/manager.go +++ b/mocks/batchmocks/manager.go @@ -5,9 +5,9 @@ package batchmocks import ( context "context" - batch "github.com/hyperledger/firefly/internal/batch" + batch "github.com/hyperledger-firefly/firefly/internal/batch" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/blockchaincommonmocks/firefly_subscriptions.go b/mocks/blockchaincommonmocks/firefly_subscriptions.go index 534b555daf..ee874fa7db 100644 --- a/mocks/blockchaincommonmocks/firefly_subscriptions.go +++ b/mocks/blockchaincommonmocks/firefly_subscriptions.go @@ -5,9 +5,9 @@ package blockchaincommonmocks import ( context "context" - common "github.com/hyperledger/firefly/internal/blockchain/common" + common "github.com/hyperledger-firefly/firefly/internal/blockchain/common" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/blockchainmocks/callbacks.go b/mocks/blockchainmocks/callbacks.go index 581314a026..06dee46258 100644 --- a/mocks/blockchainmocks/callbacks.go +++ b/mocks/blockchainmocks/callbacks.go @@ -3,7 +3,7 @@ package blockchainmocks import ( - blockchain "github.com/hyperledger/firefly/pkg/blockchain" + blockchain "github.com/hyperledger-firefly/firefly/pkg/blockchain" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/blockchainmocks/plugin.go b/mocks/blockchainmocks/plugin.go index ed0b41b049..42a6f2b8f0 100644 --- a/mocks/blockchainmocks/plugin.go +++ b/mocks/blockchainmocks/plugin.go @@ -3,18 +3,18 @@ package blockchainmocks import ( - cache "github.com/hyperledger/firefly/internal/cache" - blockchain "github.com/hyperledger/firefly/pkg/blockchain" + cache "github.com/hyperledger-firefly/firefly/internal/cache" + blockchain "github.com/hyperledger-firefly/firefly/pkg/blockchain" - config "github.com/hyperledger/firefly-common/pkg/config" + config "github.com/hyperledger-firefly/common/pkg/config" context "context" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" - metrics "github.com/hyperledger/firefly/internal/metrics" + metrics "github.com/hyperledger-firefly/firefly/internal/metrics" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/broadcastmocks/manager.go b/mocks/broadcastmocks/manager.go index 43f49a9db5..566b164929 100644 --- a/mocks/broadcastmocks/manager.go +++ b/mocks/broadcastmocks/manager.go @@ -5,12 +5,12 @@ package broadcastmocks import ( context "context" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" - core "github.com/hyperledger/firefly/pkg/core" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" + core "github.com/hyperledger-firefly/firefly/pkg/core" mock "github.com/stretchr/testify/mock" - syncasync "github.com/hyperledger/firefly/internal/syncasync" + syncasync "github.com/hyperledger-firefly/firefly/internal/syncasync" ) // Manager is an autogenerated mock type for the Manager type diff --git a/mocks/cachemocks/manager.go b/mocks/cachemocks/manager.go index 892a94f2e4..cac2069ed0 100644 --- a/mocks/cachemocks/manager.go +++ b/mocks/cachemocks/manager.go @@ -3,7 +3,7 @@ package cachemocks import ( - cache "github.com/hyperledger/firefly/internal/cache" + cache "github.com/hyperledger-firefly/firefly/internal/cache" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/contractmocks/manager.go b/mocks/contractmocks/manager.go index 32654a420c..d849657ae0 100644 --- a/mocks/contractmocks/manager.go +++ b/mocks/contractmocks/manager.go @@ -5,11 +5,11 @@ package contractmocks import ( context "context" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - ffapi "github.com/hyperledger/firefly-common/pkg/ffapi" + ffapi "github.com/hyperledger-firefly/common/pkg/ffapi" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/coremocks/operation_callbacks.go b/mocks/coremocks/operation_callbacks.go index 7d00fed033..2204ea982e 100644 --- a/mocks/coremocks/operation_callbacks.go +++ b/mocks/coremocks/operation_callbacks.go @@ -5,7 +5,7 @@ package coremocks import ( context "context" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/databasemocks/callbacks.go b/mocks/databasemocks/callbacks.go index f225311cfd..1ac6ab3c0f 100644 --- a/mocks/databasemocks/callbacks.go +++ b/mocks/databasemocks/callbacks.go @@ -3,10 +3,10 @@ package databasemocks import ( - core "github.com/hyperledger/firefly/pkg/core" - database "github.com/hyperledger/firefly/pkg/database" + core "github.com/hyperledger-firefly/firefly/pkg/core" + database "github.com/hyperledger-firefly/firefly/pkg/database" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/databasemocks/plugin.go b/mocks/databasemocks/plugin.go index 31da62ec00..a2c27f1690 100644 --- a/mocks/databasemocks/plugin.go +++ b/mocks/databasemocks/plugin.go @@ -5,15 +5,15 @@ package databasemocks import ( context "context" - config "github.com/hyperledger/firefly-common/pkg/config" + config "github.com/hyperledger-firefly/common/pkg/config" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - database "github.com/hyperledger/firefly/pkg/database" + database "github.com/hyperledger-firefly/firefly/pkg/database" - ffapi "github.com/hyperledger/firefly-common/pkg/ffapi" + ffapi "github.com/hyperledger-firefly/common/pkg/ffapi" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/dataexchangemocks/callbacks.go b/mocks/dataexchangemocks/callbacks.go index 9bbf3c1252..cc1ba29570 100644 --- a/mocks/dataexchangemocks/callbacks.go +++ b/mocks/dataexchangemocks/callbacks.go @@ -3,7 +3,7 @@ package dataexchangemocks import ( - dataexchange "github.com/hyperledger/firefly/pkg/dataexchange" + dataexchange "github.com/hyperledger-firefly/firefly/pkg/dataexchange" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/dataexchangemocks/dx_event.go b/mocks/dataexchangemocks/dx_event.go index a5d70b9a34..b38babfa05 100644 --- a/mocks/dataexchangemocks/dx_event.go +++ b/mocks/dataexchangemocks/dx_event.go @@ -3,7 +3,7 @@ package dataexchangemocks import ( - dataexchange "github.com/hyperledger/firefly/pkg/dataexchange" + dataexchange "github.com/hyperledger-firefly/firefly/pkg/dataexchange" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/dataexchangemocks/plugin.go b/mocks/dataexchangemocks/plugin.go index 4ca67108a6..a4c6f0e39b 100644 --- a/mocks/dataexchangemocks/plugin.go +++ b/mocks/dataexchangemocks/plugin.go @@ -5,17 +5,17 @@ package dataexchangemocks import ( context "context" - config "github.com/hyperledger/firefly-common/pkg/config" + config "github.com/hyperledger-firefly/common/pkg/config" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - dataexchange "github.com/hyperledger/firefly/pkg/dataexchange" + dataexchange "github.com/hyperledger-firefly/firefly/pkg/dataexchange" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" io "io" - metrics "github.com/hyperledger/firefly/internal/metrics" + metrics "github.com/hyperledger-firefly/firefly/internal/metrics" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/datamocks/manager.go b/mocks/datamocks/manager.go index 12725eeef1..059636fdf6 100644 --- a/mocks/datamocks/manager.go +++ b/mocks/datamocks/manager.go @@ -5,12 +5,12 @@ package datamocks import ( context "context" - data "github.com/hyperledger/firefly/internal/data" - core "github.com/hyperledger/firefly/pkg/core" + data "github.com/hyperledger-firefly/firefly/internal/data" + core "github.com/hyperledger-firefly/firefly/pkg/core" - ffapi "github.com/hyperledger/firefly-common/pkg/ffapi" + ffapi "github.com/hyperledger-firefly/common/pkg/ffapi" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" io "io" diff --git a/mocks/definitionsmocks/handler.go b/mocks/definitionsmocks/handler.go index c7c5b38576..62b506a532 100644 --- a/mocks/definitionsmocks/handler.go +++ b/mocks/definitionsmocks/handler.go @@ -5,10 +5,10 @@ package definitionsmocks import ( context "context" - definitions "github.com/hyperledger/firefly/internal/definitions" - core "github.com/hyperledger/firefly/pkg/core" + definitions "github.com/hyperledger-firefly/firefly/internal/definitions" + core "github.com/hyperledger-firefly/firefly/pkg/core" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/definitionsmocks/sender.go b/mocks/definitionsmocks/sender.go index d4720e15c7..86a46dd94d 100644 --- a/mocks/definitionsmocks/sender.go +++ b/mocks/definitionsmocks/sender.go @@ -5,9 +5,9 @@ package definitionsmocks import ( context "context" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/eventmocks/event_manager.go b/mocks/eventmocks/event_manager.go index 6558286a48..17174cca5d 100644 --- a/mocks/eventmocks/event_manager.go +++ b/mocks/eventmocks/event_manager.go @@ -5,23 +5,23 @@ package eventmocks import ( context "context" - blockchain "github.com/hyperledger/firefly/pkg/blockchain" + blockchain "github.com/hyperledger-firefly/firefly/pkg/blockchain" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - dataexchange "github.com/hyperledger/firefly/pkg/dataexchange" + dataexchange "github.com/hyperledger-firefly/firefly/pkg/dataexchange" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" - pkgevents "github.com/hyperledger/firefly/pkg/events" + pkgevents "github.com/hyperledger-firefly/firefly/pkg/events" - sharedstorage "github.com/hyperledger/firefly/pkg/sharedstorage" + sharedstorage "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" - system "github.com/hyperledger/firefly/internal/events/system" + system "github.com/hyperledger-firefly/firefly/internal/events/system" - tokens "github.com/hyperledger/firefly/pkg/tokens" + tokens "github.com/hyperledger-firefly/firefly/pkg/tokens" ) // EventManager is an autogenerated mock type for the EventManager type diff --git a/mocks/eventsmocks/callbacks.go b/mocks/eventsmocks/callbacks.go index 8b607a1ea8..7486fa6600 100644 --- a/mocks/eventsmocks/callbacks.go +++ b/mocks/eventsmocks/callbacks.go @@ -3,8 +3,8 @@ package eventsmocks import ( - core "github.com/hyperledger/firefly/pkg/core" - events "github.com/hyperledger/firefly/pkg/events" + core "github.com/hyperledger-firefly/firefly/pkg/core" + events "github.com/hyperledger-firefly/firefly/pkg/events" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/eventsmocks/plugin.go b/mocks/eventsmocks/plugin.go index 48e0b2363e..8f4a5a262b 100644 --- a/mocks/eventsmocks/plugin.go +++ b/mocks/eventsmocks/plugin.go @@ -5,11 +5,11 @@ package eventsmocks import ( context "context" - config "github.com/hyperledger/firefly-common/pkg/config" + config "github.com/hyperledger-firefly/common/pkg/config" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - events "github.com/hyperledger/firefly/pkg/events" + events "github.com/hyperledger-firefly/firefly/pkg/events" mock "github.com/stretchr/testify/mock" diff --git a/mocks/identitymanagermocks/manager.go b/mocks/identitymanagermocks/manager.go index 78a8316619..c1a99e4107 100644 --- a/mocks/identitymanagermocks/manager.go +++ b/mocks/identitymanagermocks/manager.go @@ -5,11 +5,11 @@ package identitymanagermocks import ( context "context" - blockchain "github.com/hyperledger/firefly/pkg/blockchain" + blockchain "github.com/hyperledger-firefly/firefly/pkg/blockchain" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/identitymocks/plugin.go b/mocks/identitymocks/plugin.go index 62c596a587..99593784a2 100644 --- a/mocks/identitymocks/plugin.go +++ b/mocks/identitymocks/plugin.go @@ -5,9 +5,9 @@ package identitymocks import ( context "context" - config "github.com/hyperledger/firefly-common/pkg/config" + config "github.com/hyperledger-firefly/common/pkg/config" - identity "github.com/hyperledger/firefly/pkg/identity" + identity "github.com/hyperledger-firefly/firefly/pkg/identity" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/metricsmocks/manager.go b/mocks/metricsmocks/manager.go index 5c502e4d9c..f9724a26b8 100644 --- a/mocks/metricsmocks/manager.go +++ b/mocks/metricsmocks/manager.go @@ -3,10 +3,10 @@ package metricsmocks import ( - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" - core "github.com/hyperledger/firefly/pkg/core" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" + core "github.com/hyperledger-firefly/firefly/pkg/core" - metrics "github.com/hyperledger/firefly/internal/metrics" + metrics "github.com/hyperledger-firefly/firefly/internal/metrics" mock "github.com/stretchr/testify/mock" diff --git a/mocks/multipartymocks/manager.go b/mocks/multipartymocks/manager.go index c4d78d8d64..a5268594ba 100644 --- a/mocks/multipartymocks/manager.go +++ b/mocks/multipartymocks/manager.go @@ -5,15 +5,15 @@ package multipartymocks import ( context "context" - blockchain "github.com/hyperledger/firefly/pkg/blockchain" + blockchain "github.com/hyperledger-firefly/firefly/pkg/blockchain" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" - multiparty "github.com/hyperledger/firefly/internal/multiparty" + multiparty "github.com/hyperledger-firefly/firefly/internal/multiparty" ) // Manager is an autogenerated mock type for the Manager type diff --git a/mocks/namespacemocks/manager.go b/mocks/namespacemocks/manager.go index 1c29f3c8fd..81c9fcef69 100644 --- a/mocks/namespacemocks/manager.go +++ b/mocks/namespacemocks/manager.go @@ -5,14 +5,14 @@ package namespacemocks import ( context "context" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" - core "github.com/hyperledger/firefly/pkg/core" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" + core "github.com/hyperledger-firefly/firefly/pkg/core" mock "github.com/stretchr/testify/mock" - orchestrator "github.com/hyperledger/firefly/internal/orchestrator" + orchestrator "github.com/hyperledger-firefly/firefly/internal/orchestrator" - spievents "github.com/hyperledger/firefly/internal/spievents" + spievents "github.com/hyperledger-firefly/firefly/internal/spievents" ) // Manager is an autogenerated mock type for the Manager type diff --git a/mocks/networkmapmocks/manager.go b/mocks/networkmapmocks/manager.go index 5e45660fd0..0d6469640a 100644 --- a/mocks/networkmapmocks/manager.go +++ b/mocks/networkmapmocks/manager.go @@ -5,12 +5,12 @@ package networkmapmocks import ( context "context" - ffapi "github.com/hyperledger/firefly-common/pkg/ffapi" - core "github.com/hyperledger/firefly/pkg/core" + ffapi "github.com/hyperledger-firefly/common/pkg/ffapi" + core "github.com/hyperledger-firefly/firefly/pkg/core" mock "github.com/stretchr/testify/mock" - networkmap "github.com/hyperledger/firefly/internal/networkmap" + networkmap "github.com/hyperledger-firefly/firefly/internal/networkmap" ) // Manager is an autogenerated mock type for the Manager type diff --git a/mocks/operationmocks/manager.go b/mocks/operationmocks/manager.go index 9d3fcbe15c..a4914ddec4 100644 --- a/mocks/operationmocks/manager.go +++ b/mocks/operationmocks/manager.go @@ -5,14 +5,14 @@ package operationmocks import ( context "context" - core "github.com/hyperledger/firefly/pkg/core" - database "github.com/hyperledger/firefly/pkg/database" + core "github.com/hyperledger-firefly/firefly/pkg/core" + database "github.com/hyperledger-firefly/firefly/pkg/database" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" - operations "github.com/hyperledger/firefly/internal/operations" + operations "github.com/hyperledger-firefly/firefly/internal/operations" ) // Manager is an autogenerated mock type for the Manager type diff --git a/mocks/orchestratormocks/orchestrator.go b/mocks/orchestratormocks/orchestrator.go index 2027fa90db..efe2bf7ab4 100644 --- a/mocks/orchestratormocks/orchestrator.go +++ b/mocks/orchestratormocks/orchestrator.go @@ -3,40 +3,40 @@ package orchestratormocks import ( - assets "github.com/hyperledger/firefly/internal/assets" - batch "github.com/hyperledger/firefly/internal/batch" + assets "github.com/hyperledger-firefly/firefly/internal/assets" + batch "github.com/hyperledger-firefly/firefly/internal/batch" - broadcast "github.com/hyperledger/firefly/internal/broadcast" + broadcast "github.com/hyperledger-firefly/firefly/internal/broadcast" context "context" - contracts "github.com/hyperledger/firefly/internal/contracts" + contracts "github.com/hyperledger-firefly/firefly/internal/contracts" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - data "github.com/hyperledger/firefly/internal/data" + data "github.com/hyperledger-firefly/firefly/internal/data" - database "github.com/hyperledger/firefly/pkg/database" + database "github.com/hyperledger-firefly/firefly/pkg/database" - definitions "github.com/hyperledger/firefly/internal/definitions" + definitions "github.com/hyperledger-firefly/firefly/internal/definitions" - events "github.com/hyperledger/firefly/internal/events" + events "github.com/hyperledger-firefly/firefly/internal/events" - ffapi "github.com/hyperledger/firefly-common/pkg/ffapi" + ffapi "github.com/hyperledger-firefly/common/pkg/ffapi" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" - identity "github.com/hyperledger/firefly/internal/identity" + identity "github.com/hyperledger-firefly/firefly/internal/identity" mock "github.com/stretchr/testify/mock" - multiparty "github.com/hyperledger/firefly/internal/multiparty" + multiparty "github.com/hyperledger-firefly/firefly/internal/multiparty" - networkmap "github.com/hyperledger/firefly/internal/networkmap" + networkmap "github.com/hyperledger-firefly/firefly/internal/networkmap" - operations "github.com/hyperledger/firefly/internal/operations" + operations "github.com/hyperledger-firefly/firefly/internal/operations" - privatemessaging "github.com/hyperledger/firefly/internal/privatemessaging" + privatemessaging "github.com/hyperledger-firefly/firefly/internal/privatemessaging" ) // Orchestrator is an autogenerated mock type for the Orchestrator type diff --git a/mocks/privatemessagingmocks/manager.go b/mocks/privatemessagingmocks/manager.go index 5ba8bedce8..769b6452e5 100644 --- a/mocks/privatemessagingmocks/manager.go +++ b/mocks/privatemessagingmocks/manager.go @@ -5,14 +5,14 @@ package privatemessagingmocks import ( context "context" - ffapi "github.com/hyperledger/firefly-common/pkg/ffapi" - core "github.com/hyperledger/firefly/pkg/core" + ffapi "github.com/hyperledger-firefly/common/pkg/ffapi" + core "github.com/hyperledger-firefly/firefly/pkg/core" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" - syncasync "github.com/hyperledger/firefly/internal/syncasync" + syncasync "github.com/hyperledger-firefly/firefly/internal/syncasync" ) // Manager is an autogenerated mock type for the Manager type diff --git a/mocks/shareddownloadmocks/callbacks.go b/mocks/shareddownloadmocks/callbacks.go index f5ec29ae16..9114f4b6d8 100644 --- a/mocks/shareddownloadmocks/callbacks.go +++ b/mocks/shareddownloadmocks/callbacks.go @@ -3,7 +3,7 @@ package shareddownloadmocks import ( - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/shareddownloadmocks/manager.go b/mocks/shareddownloadmocks/manager.go index 53c98a53ee..95e14bae0c 100644 --- a/mocks/shareddownloadmocks/manager.go +++ b/mocks/shareddownloadmocks/manager.go @@ -5,7 +5,7 @@ package shareddownloadmocks import ( context "context" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/sharedstoragemocks/plugin.go b/mocks/sharedstoragemocks/plugin.go index 4b7e61bde0..c5431523f5 100644 --- a/mocks/sharedstoragemocks/plugin.go +++ b/mocks/sharedstoragemocks/plugin.go @@ -5,13 +5,13 @@ package sharedstoragemocks import ( context "context" - config "github.com/hyperledger/firefly-common/pkg/config" + config "github.com/hyperledger-firefly/common/pkg/config" io "io" mock "github.com/stretchr/testify/mock" - sharedstorage "github.com/hyperledger/firefly/pkg/sharedstorage" + sharedstorage "github.com/hyperledger-firefly/firefly/pkg/sharedstorage" ) // Plugin is an autogenerated mock type for the Plugin type diff --git a/mocks/spieventsmocks/manager.go b/mocks/spieventsmocks/manager.go index 111ca05dff..727b7c9835 100644 --- a/mocks/spieventsmocks/manager.go +++ b/mocks/spieventsmocks/manager.go @@ -5,7 +5,7 @@ package spieventsmocks import ( http "net/http" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/syncasyncmocks/bridge.go b/mocks/syncasyncmocks/bridge.go index a5fe867ceb..17c5bfb7c3 100644 --- a/mocks/syncasyncmocks/bridge.go +++ b/mocks/syncasyncmocks/bridge.go @@ -5,14 +5,14 @@ package syncasyncmocks import ( context "context" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" - core "github.com/hyperledger/firefly/pkg/core" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" + core "github.com/hyperledger-firefly/firefly/pkg/core" mock "github.com/stretchr/testify/mock" - syncasync "github.com/hyperledger/firefly/internal/syncasync" + syncasync "github.com/hyperledger-firefly/firefly/internal/syncasync" - system "github.com/hyperledger/firefly/internal/events/system" + system "github.com/hyperledger-firefly/firefly/internal/events/system" ) // Bridge is an autogenerated mock type for the Bridge type diff --git a/mocks/systemeventmocks/event_interface.go b/mocks/systemeventmocks/event_interface.go index 24650a858e..172fc16eef 100644 --- a/mocks/systemeventmocks/event_interface.go +++ b/mocks/systemeventmocks/event_interface.go @@ -3,7 +3,7 @@ package systemeventmocks import ( - system "github.com/hyperledger/firefly/internal/events/system" + system "github.com/hyperledger-firefly/firefly/internal/events/system" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/tokenmocks/callbacks.go b/mocks/tokenmocks/callbacks.go index da55fa787d..2a2b37b31d 100644 --- a/mocks/tokenmocks/callbacks.go +++ b/mocks/tokenmocks/callbacks.go @@ -5,7 +5,7 @@ package tokenmocks import ( context "context" - tokens "github.com/hyperledger/firefly/pkg/tokens" + tokens "github.com/hyperledger-firefly/firefly/pkg/tokens" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/tokenmocks/plugin.go b/mocks/tokenmocks/plugin.go index ea61d3d2a4..7628a73c25 100644 --- a/mocks/tokenmocks/plugin.go +++ b/mocks/tokenmocks/plugin.go @@ -5,15 +5,15 @@ package tokenmocks import ( context "context" - config "github.com/hyperledger/firefly-common/pkg/config" + config "github.com/hyperledger-firefly/common/pkg/config" - core "github.com/hyperledger/firefly/pkg/core" + core "github.com/hyperledger-firefly/firefly/pkg/core" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" mock "github.com/stretchr/testify/mock" - tokens "github.com/hyperledger/firefly/pkg/tokens" + tokens "github.com/hyperledger-firefly/firefly/pkg/tokens" ) // Plugin is an autogenerated mock type for the Plugin type diff --git a/mocks/txcommonmocks/helper.go b/mocks/txcommonmocks/helper.go index 57ab913d65..75ce3176fc 100644 --- a/mocks/txcommonmocks/helper.go +++ b/mocks/txcommonmocks/helper.go @@ -5,12 +5,12 @@ package txcommonmocks import ( context "context" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" - core "github.com/hyperledger/firefly/pkg/core" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" + core "github.com/hyperledger-firefly/firefly/pkg/core" mock "github.com/stretchr/testify/mock" - txcommon "github.com/hyperledger/firefly/internal/txcommon" + txcommon "github.com/hyperledger-firefly/firefly/internal/txcommon" ) // Helper is an autogenerated mock type for the Helper type diff --git a/mocks/txwritermocks/writer.go b/mocks/txwritermocks/writer.go index 811a440907..91560c127b 100644 --- a/mocks/txwritermocks/writer.go +++ b/mocks/txwritermocks/writer.go @@ -5,8 +5,8 @@ package txwritermocks import ( context "context" - fftypes "github.com/hyperledger/firefly-common/pkg/fftypes" - core "github.com/hyperledger/firefly/pkg/core" + fftypes "github.com/hyperledger-firefly/common/pkg/fftypes" + core "github.com/hyperledger-firefly/firefly/pkg/core" mock "github.com/stretchr/testify/mock" ) diff --git a/mocks/wsmocks/ws_client.go b/mocks/wsmocks/ws_client.go index 1a75210045..54c358d30e 100644 --- a/mocks/wsmocks/ws_client.go +++ b/mocks/wsmocks/ws_client.go @@ -5,7 +5,7 @@ package wsmocks import ( context "context" - wsclient "github.com/hyperledger/firefly-common/pkg/wsclient" + wsclient "github.com/hyperledger-firefly/common/pkg/wsclient" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/blockchain/plugin.go b/pkg/blockchain/plugin.go index db0c3b09e8..f975d4dfd8 100644 --- a/pkg/blockchain/plugin.go +++ b/pkg/blockchain/plugin.go @@ -19,11 +19,11 @@ package blockchain import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/internal/cache" - "github.com/hyperledger/firefly/internal/metrics" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/internal/cache" + "github.com/hyperledger-firefly/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // ResolveKeyIntent allows us to distinguish between resolving a key just for a lookup, vs. accepting in an action to sign diff --git a/pkg/core/authorizer.go b/pkg/core/authorizer.go index 76b7586cfc..9e2ee60c93 100644 --- a/pkg/core/authorizer.go +++ b/pkg/core/authorizer.go @@ -19,7 +19,7 @@ package core import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type Authorizer interface { diff --git a/pkg/core/batch.go b/pkg/core/batch.go index a8e187fb60..a7942840f7 100644 --- a/pkg/core/batch.go +++ b/pkg/core/batch.go @@ -20,7 +20,7 @@ import ( "crypto/sha256" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) // BatchType is the type of a batch diff --git a/pkg/core/batch_state.go b/pkg/core/batch_state.go index c4c3b931e8..7cb087fc6b 100644 --- a/pkg/core/batch_state.go +++ b/pkg/core/batch_state.go @@ -19,7 +19,7 @@ package core import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) // BatchState tracks the state between definition handlers that run in-line on the pin processing route in the aggregator diff --git a/pkg/core/batch_state_test.go b/pkg/core/batch_state_test.go index cf8c68c59e..cb715513e8 100644 --- a/pkg/core/batch_state_test.go +++ b/pkg/core/batch_state_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/batch_test.go b/pkg/core/batch_test.go index 60173a0c78..2e2578c97a 100644 --- a/pkg/core/batch_test.go +++ b/pkg/core/batch_test.go @@ -22,7 +22,7 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/blob.go b/pkg/core/blob.go index 2e1e42f504..fb42068468 100644 --- a/pkg/core/blob.go +++ b/pkg/core/blob.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type Blob struct { Sequence int64 `json:"-"` diff --git a/pkg/core/blockchainevent.go b/pkg/core/blockchainevent.go index 8334f8a6fd..e7fa3e9698 100644 --- a/pkg/core/blockchainevent.go +++ b/pkg/core/blockchainevent.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type BlockchainEvent struct { ID *fftypes.UUID `ffstruct:"BlockchainEvent" json:"id,omitempty"` diff --git a/pkg/core/change_event.go b/pkg/core/change_event.go index f1ae86e8a7..59da03014f 100644 --- a/pkg/core/change_event.go +++ b/pkg/core/change_event.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" // ChangeEventType type ChangeEventType string diff --git a/pkg/core/charthistogram.go b/pkg/core/charthistogram.go index df35ca92c5..82fe759402 100644 --- a/pkg/core/charthistogram.go +++ b/pkg/core/charthistogram.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" const ( // ChartHistogramMaxBuckets max buckets that can be requested diff --git a/pkg/core/contract_listener.go b/pkg/core/contract_listener.go index 1eae679236..8913ac1b0c 100644 --- a/pkg/core/contract_listener.go +++ b/pkg/core/contract_listener.go @@ -21,8 +21,8 @@ import ( "database/sql/driver" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) type ContractListener struct { diff --git a/pkg/core/contract_listener_test.go b/pkg/core/contract_listener_test.go index cb5566b25e..7dfdde77e6 100644 --- a/pkg/core/contract_listener_test.go +++ b/pkg/core/contract_listener_test.go @@ -19,7 +19,7 @@ package core import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/contracts.go b/pkg/core/contracts.go index 92a1efc3ed..c164fdb50b 100644 --- a/pkg/core/contracts.go +++ b/pkg/core/contracts.go @@ -19,7 +19,7 @@ package core import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type ContractCallType = fftypes.FFEnum diff --git a/pkg/core/contracts_test.go b/pkg/core/contracts_test.go index 829f1b9243..f784b9311c 100644 --- a/pkg/core/contracts_test.go +++ b/pkg/core/contracts_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/data.go b/pkg/core/data.go index da906223ed..985d545e5e 100644 --- a/pkg/core/data.go +++ b/pkg/core/data.go @@ -23,8 +23,8 @@ import ( "fmt" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) type DataRef struct { diff --git a/pkg/core/data_test.go b/pkg/core/data_test.go index db339d8c9c..14353dbba6 100644 --- a/pkg/core/data_test.go +++ b/pkg/core/data_test.go @@ -22,7 +22,7 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/datatype.go b/pkg/core/datatype.go index cd21ba4f66..fabc533b98 100644 --- a/pkg/core/datatype.go +++ b/pkg/core/datatype.go @@ -19,8 +19,8 @@ package core import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) type ValidatorType = fftypes.FFEnum diff --git a/pkg/core/datatype_test.go b/pkg/core/datatype_test.go index 790f3239b8..54169d8d21 100644 --- a/pkg/core/datatype_test.go +++ b/pkg/core/datatype_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/definition.go b/pkg/core/definition.go index 329e74993e..72d618a491 100644 --- a/pkg/core/definition.go +++ b/pkg/core/definition.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" // Definition is implemented by all objects that can be broadcast as system definitions to the network type Definition interface { diff --git a/pkg/core/event.go b/pkg/core/event.go index 6f659be681..efc380e274 100644 --- a/pkg/core/event.go +++ b/pkg/core/event.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" // EventType indicates what the event means, as well as what the Reference in the event refers to type EventType = fftypes.FFEnum diff --git a/pkg/core/event_test.go b/pkg/core/event_test.go index 791b4115d3..7b1def005f 100644 --- a/pkg/core/event_test.go +++ b/pkg/core/event_test.go @@ -19,7 +19,7 @@ package core import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/group.go b/pkg/core/group.go index ef9faba6be..82bd2204ab 100644 --- a/pkg/core/group.go +++ b/pkg/core/group.go @@ -23,8 +23,8 @@ import ( "fmt" "sort" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) type GroupIdentity struct { diff --git a/pkg/core/group_test.go b/pkg/core/group_test.go index b75eb19e6a..2b227f65d4 100644 --- a/pkg/core/group_test.go +++ b/pkg/core/group_test.go @@ -21,7 +21,7 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/id_and_sequence.go b/pkg/core/id_and_sequence.go index ce3959ed37..6328adeb92 100644 --- a/pkg/core/id_and_sequence.go +++ b/pkg/core/id_and_sequence.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" // IDAndSequence is a combination of a UUID and a stored sequence type IDAndSequence struct { diff --git a/pkg/core/idempotency_key.go b/pkg/core/idempotency_key.go index d49cfa3196..962834f2b5 100644 --- a/pkg/core/idempotency_key.go +++ b/pkg/core/idempotency_key.go @@ -20,7 +20,7 @@ import ( "context" "database/sql/driver" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // IdempotencyKey is accessed in Go as a string, but when persisted to storage it will be stored as a null diff --git a/pkg/core/identity.go b/pkg/core/identity.go index ff829fa7bd..9edecf326c 100644 --- a/pkg/core/identity.go +++ b/pkg/core/identity.go @@ -21,9 +21,9 @@ import ( "crypto/sha256" "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/log" ) // IdentityType is the type of an identity diff --git a/pkg/core/identity_test.go b/pkg/core/identity_test.go index e54d2c1c9a..4fbdf4c5ff 100644 --- a/pkg/core/identity_test.go +++ b/pkg/core/identity_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/message.go b/pkg/core/message.go index d878163e3b..3785ba7c83 100644 --- a/pkg/core/message.go +++ b/pkg/core/message.go @@ -21,8 +21,8 @@ import ( "crypto/sha256" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) const ( diff --git a/pkg/core/message_test.go b/pkg/core/message_test.go index b287ca67b6..c9264cba06 100644 --- a/pkg/core/message_test.go +++ b/pkg/core/message_test.go @@ -22,7 +22,7 @@ import ( "encoding/json" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/namespace.go b/pkg/core/namespace.go index 271d7800fb..e41de3fcf2 100644 --- a/pkg/core/namespace.go +++ b/pkg/core/namespace.go @@ -22,8 +22,8 @@ import ( "database/sql/driver" "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // Namespace is an isolated set of named resources, to allow multiple applications to co-exist in the same network, with the same named objects. diff --git a/pkg/core/namespace_status.go b/pkg/core/namespace_status.go index d191874142..0d31a904ca 100644 --- a/pkg/core/namespace_status.go +++ b/pkg/core/namespace_status.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" // NamespaceStatus is a set of information that represents the configuration and status of a given namespace type NamespaceStatus struct { diff --git a/pkg/core/namespace_test.go b/pkg/core/namespace_test.go index bb165c18d1..e715a6fd80 100644 --- a/pkg/core/namespace_test.go +++ b/pkg/core/namespace_test.go @@ -19,7 +19,7 @@ package core import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/nextpin.go b/pkg/core/nextpin.go index dfc2f45150..a1238e555a 100644 --- a/pkg/core/nextpin.go +++ b/pkg/core/nextpin.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type NextPin struct { Namespace string `ffstruct:"NextPin" json:"namespace"` diff --git a/pkg/core/node.go b/pkg/core/node.go index d009a1614b..28068f6071 100644 --- a/pkg/core/node.go +++ b/pkg/core/node.go @@ -19,7 +19,7 @@ package core import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) // DeprecatedNode is the data structure we used to use prior to FIR-9. diff --git a/pkg/core/node_test.go b/pkg/core/node_test.go index 7210112cee..cf67f60cae 100644 --- a/pkg/core/node_test.go +++ b/pkg/core/node_test.go @@ -19,7 +19,7 @@ package core import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/nonce.go b/pkg/core/nonce.go index 0d7c353109..1af879913a 100644 --- a/pkg/core/nonce.go +++ b/pkg/core/nonce.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" // Nonce is this local node's state record for the context of a group+topic+author combination. // The Hash is the state of the hash before the nonce is added on to make it unique to the message. diff --git a/pkg/core/offset.go b/pkg/core/offset.go index ccac4bb76e..28dab8fb9d 100644 --- a/pkg/core/offset.go +++ b/pkg/core/offset.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type OffsetType = fftypes.FFEnum diff --git a/pkg/core/operation.go b/pkg/core/operation.go index 6cbd884ba3..71782d2d4e 100644 --- a/pkg/core/operation.go +++ b/pkg/core/operation.go @@ -20,9 +20,9 @@ import ( "context" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" ) // OpType describes mechanical steps in the process that have to be performed, diff --git a/pkg/core/operation_test.go b/pkg/core/operation_test.go index 6f9f4b44ef..384b31102e 100644 --- a/pkg/core/operation_test.go +++ b/pkg/core/operation_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/organization.go b/pkg/core/organization.go index e215fea76c..cfe26b4c01 100644 --- a/pkg/core/organization.go +++ b/pkg/core/organization.go @@ -19,7 +19,7 @@ package core import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) // DeprecatedOrganization is the data structure we used to use prior to FIR-9. diff --git a/pkg/core/organization_test.go b/pkg/core/organization_test.go index b8285f69d8..7256b1ce53 100644 --- a/pkg/core/organization_test.go +++ b/pkg/core/organization_test.go @@ -19,7 +19,7 @@ package core import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/pin.go b/pkg/core/pin.go index 9a12f1f21c..d3c6b44331 100644 --- a/pkg/core/pin.go +++ b/pkg/core/pin.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" // Pin represents a ledger-pinning event that has been // detected from the blockchain, in the sequence that it was detected. diff --git a/pkg/core/subscription.go b/pkg/core/subscription.go index bf9c4845c6..54c9d7c438 100644 --- a/pkg/core/subscription.go +++ b/pkg/core/subscription.go @@ -22,8 +22,8 @@ import ( "encoding/json" "net/url" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" ) // SubscriptionFilter contains regular expressions to match against events. All must match for an event to be dispatched to a subscription diff --git a/pkg/core/tokenapproval.go b/pkg/core/tokenapproval.go index 5f54d8b12d..fa1383ea57 100644 --- a/pkg/core/tokenapproval.go +++ b/pkg/core/tokenapproval.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type TokenApprovalInput struct { TokenApproval diff --git a/pkg/core/tokenbalance.go b/pkg/core/tokenbalance.go index 10f885468d..bec1b46b23 100644 --- a/pkg/core/tokenbalance.go +++ b/pkg/core/tokenbalance.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type TokenBalance struct { Pool *fftypes.UUID `ffstruct:"TokenBalance" json:"pool,omitempty"` diff --git a/pkg/core/tokenbalance_test.go b/pkg/core/tokenbalance_test.go index fd115a707e..ad4efab7d9 100644 --- a/pkg/core/tokenbalance_test.go +++ b/pkg/core/tokenbalance_test.go @@ -19,7 +19,7 @@ package core import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/tokenpool.go b/pkg/core/tokenpool.go index d4d7dccbcb..39b4ae84f0 100644 --- a/pkg/core/tokenpool.go +++ b/pkg/core/tokenpool.go @@ -19,7 +19,7 @@ package core import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type TokenType = fftypes.FFEnum diff --git a/pkg/core/tokenpool_test.go b/pkg/core/tokenpool_test.go index e2cafdceb9..9192763b75 100644 --- a/pkg/core/tokenpool_test.go +++ b/pkg/core/tokenpool_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/tokentransfer.go b/pkg/core/tokentransfer.go index ac59d32d68..c893fae388 100644 --- a/pkg/core/tokentransfer.go +++ b/pkg/core/tokentransfer.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type TokenTransferType = fftypes.FFEnum diff --git a/pkg/core/transaction.go b/pkg/core/transaction.go index ab3570a974..8f11ab4622 100644 --- a/pkg/core/transaction.go +++ b/pkg/core/transaction.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type TransactionType = fftypes.FFEnum diff --git a/pkg/core/transport_wrapper.go b/pkg/core/transport_wrapper.go index c15dee5ce0..a4918defa3 100644 --- a/pkg/core/transport_wrapper.go +++ b/pkg/core/transport_wrapper.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type TransportPayloadType = fftypes.FFEnum diff --git a/pkg/core/transport_wrapper_test.go b/pkg/core/transport_wrapper_test.go index d6496dab11..48b87b08de 100644 --- a/pkg/core/transport_wrapper_test.go +++ b/pkg/core/transport_wrapper_test.go @@ -19,7 +19,7 @@ package core import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/verifier.go b/pkg/core/verifier.go index 5af0ca010a..21829441a8 100644 --- a/pkg/core/verifier.go +++ b/pkg/core/verifier.go @@ -19,7 +19,7 @@ package core import ( "crypto/sha256" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) // VerifierType is the type of an identity verifier. Where possible we use established DID verifier type strings diff --git a/pkg/core/verifier_test.go b/pkg/core/verifier_test.go index a217ea30ae..7e44439fbf 100644 --- a/pkg/core/verifier_test.go +++ b/pkg/core/verifier_test.go @@ -19,7 +19,7 @@ package core import ( "testing" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/websocket_actions.go b/pkg/core/websocket_actions.go index 5511489460..19bb8418b6 100644 --- a/pkg/core/websocket_actions.go +++ b/pkg/core/websocket_actions.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" // WSClientPayloadType actions go from client->server type WSClientPayloadType = fftypes.FFEnum diff --git a/pkg/core/websocket_status.go b/pkg/core/websocket_status.go index 57b61db7a3..bd8d80c653 100644 --- a/pkg/core/websocket_status.go +++ b/pkg/core/websocket_status.go @@ -16,7 +16,7 @@ package core -import "github.com/hyperledger/firefly-common/pkg/fftypes" +import "github.com/hyperledger-firefly/common/pkg/fftypes" type WSSubscriptionStatus struct { StartTime *fftypes.FFTime `ffstruct:"WSSubscriptionStatus" json:"startTime"` diff --git a/pkg/database/plugin.go b/pkg/database/plugin.go index 1a6ec10a26..2d7e8d3b79 100644 --- a/pkg/database/plugin.go +++ b/pkg/database/plugin.go @@ -19,12 +19,12 @@ package database import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/ffapi" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/i18n" - "github.com/hyperledger/firefly/internal/coremsgs" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/ffapi" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/i18n" + "github.com/hyperledger-firefly/firefly/internal/coremsgs" + "github.com/hyperledger-firefly/firefly/pkg/core" ) var ( diff --git a/pkg/dataexchange/plugin.go b/pkg/dataexchange/plugin.go index a481f43c80..d48105da20 100644 --- a/pkg/dataexchange/plugin.go +++ b/pkg/dataexchange/plugin.go @@ -20,11 +20,11 @@ import ( "context" "io" - "github.com/hyperledger/firefly/internal/metrics" + "github.com/hyperledger-firefly/firefly/internal/metrics" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // Plugin is the interface implemented by each data exchange plugin diff --git a/pkg/events/plugin.go b/pkg/events/plugin.go index 03098c5d2a..b187ff78bd 100644 --- a/pkg/events/plugin.go +++ b/pkg/events/plugin.go @@ -20,8 +20,8 @@ import ( "context" "time" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // Plugin is the interface implemented by event interface diff --git a/pkg/identity/plugin.go b/pkg/identity/plugin.go index c6c13d4075..34855a3d61 100644 --- a/pkg/identity/plugin.go +++ b/pkg/identity/plugin.go @@ -19,8 +19,8 @@ package identity import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // Plugin is the interface implemented by each identity plugin @@ -49,7 +49,7 @@ type Plugin interface { // solutions into FireFly is required. However, the immediate shift in Sep 2021 moved to defining // a strong enough identity construct within FireFly to map from/to. // - // See issue https://github.com/hyperledger/firefly/issues/187 to contribute to the discussion + // See issue https://github.com/hyperledger-firefly/firefly/issues/187 to contribute to the discussion } diff --git a/pkg/sharedstorage/plugin.go b/pkg/sharedstorage/plugin.go index 4f98046c06..d217ab2401 100644 --- a/pkg/sharedstorage/plugin.go +++ b/pkg/sharedstorage/plugin.go @@ -20,8 +20,8 @@ import ( "context" "io" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // Plugin is the interface implemented by each Shared Storage plugin diff --git a/pkg/tokens/plugin.go b/pkg/tokens/plugin.go index 8b814d8efa..ba9b4f6ec0 100644 --- a/pkg/tokens/plugin.go +++ b/pkg/tokens/plugin.go @@ -19,10 +19,10 @@ package tokens import ( "context" - "github.com/hyperledger/firefly-common/pkg/config" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/blockchain" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/config" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/blockchain" + "github.com/hyperledger-firefly/firefly/pkg/core" ) // Plugin is the interface implemented by each tokens plugin diff --git a/pkg/utils/dbstring.go b/pkg/utils/dbstring.go index a8608535c1..23e37786f4 100644 --- a/pkg/utils/dbstring.go +++ b/pkg/utils/dbstring.go @@ -22,7 +22,7 @@ import ( "strings" "unicode/utf8" - "github.com/hyperledger/firefly-common/pkg/log" + "github.com/hyperledger-firefly/common/pkg/log" ) // DBSafeUTF8StringFromPtr returns a DB-safe UTF-8 string from a pointer. diff --git a/smart_contracts/fabric/custompin-sample/chaincode/contract.go b/smart_contracts/fabric/custompin-sample/chaincode/contract.go index faeefb1a80..6a7083d53d 100644 --- a/smart_contracts/fabric/custompin-sample/chaincode/contract.go +++ b/smart_contracts/fabric/custompin-sample/chaincode/contract.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" + "github.com/hyperledger-firefly/firefly/custompin_sample/batchpin" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/firefly/custompin_sample/batchpin" ) /** diff --git a/smart_contracts/fabric/custompin-sample/chaincode/contract_test.go b/smart_contracts/fabric/custompin-sample/chaincode/contract_test.go index 8de074d443..a8b3c76245 100644 --- a/smart_contracts/fabric/custompin-sample/chaincode/contract_test.go +++ b/smart_contracts/fabric/custompin-sample/chaincode/contract_test.go @@ -3,11 +3,11 @@ package chaincode_test import ( "testing" + "github.com/hyperledger-firefly/firefly/custompin_sample/chaincode" + "github.com/hyperledger-firefly/firefly/custompin_sample/chaincode/mocks" "github.com/hyperledger/fabric-chaincode-go/pkg/cid" "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/firefly/custompin_sample/chaincode" - "github.com/hyperledger/firefly/custompin_sample/chaincode/mocks" "github.com/stretchr/testify/require" ) diff --git a/smart_contracts/fabric/custompin-sample/custompin.go b/smart_contracts/fabric/custompin-sample/custompin.go index e7157ec35c..f251cda0cd 100644 --- a/smart_contracts/fabric/custompin-sample/custompin.go +++ b/smart_contracts/fabric/custompin-sample/custompin.go @@ -7,8 +7,8 @@ package main import ( "log" + "github.com/hyperledger-firefly/firefly/custompin_sample/chaincode" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/firefly/custompin_sample/chaincode" ) func main() { diff --git a/smart_contracts/fabric/custompin-sample/go.mod b/smart_contracts/fabric/custompin-sample/go.mod index ac49b91f56..9e881d1d22 100644 --- a/smart_contracts/fabric/custompin-sample/go.mod +++ b/smart_contracts/fabric/custompin-sample/go.mod @@ -1,4 +1,4 @@ -module github.com/hyperledger/firefly/custompin_sample +module github.com/hyperledger-firefly/firefly/custompin_sample go 1.26.0 diff --git a/smart_contracts/fabric/firefly-go/chaincode/contract.go b/smart_contracts/fabric/firefly-go/chaincode/contract.go index e1a50de798..ff899c965d 100644 --- a/smart_contracts/fabric/firefly-go/chaincode/contract.go +++ b/smart_contracts/fabric/firefly-go/chaincode/contract.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" + "github.com/hyperledger-firefly/firefly/chaincode-go/batchpin" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/firefly/chaincode-go/batchpin" ) type SmartContract struct { diff --git a/smart_contracts/fabric/firefly-go/chaincode/contract_test.go b/smart_contracts/fabric/firefly-go/chaincode/contract_test.go index 123acfaf08..099c9a9a1c 100644 --- a/smart_contracts/fabric/firefly-go/chaincode/contract_test.go +++ b/smart_contracts/fabric/firefly-go/chaincode/contract_test.go @@ -3,11 +3,11 @@ package chaincode_test import ( "testing" + "github.com/hyperledger-firefly/firefly/chaincode-go/chaincode" + "github.com/hyperledger-firefly/firefly/chaincode-go/chaincode/mocks" "github.com/hyperledger/fabric-chaincode-go/pkg/cid" "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/firefly/chaincode-go/chaincode" - "github.com/hyperledger/firefly/chaincode-go/chaincode/mocks" "github.com/stretchr/testify/require" ) diff --git a/smart_contracts/fabric/firefly-go/firefly.go b/smart_contracts/fabric/firefly-go/firefly.go index c865efc6e9..69ab51cbe8 100644 --- a/smart_contracts/fabric/firefly-go/firefly.go +++ b/smart_contracts/fabric/firefly-go/firefly.go @@ -7,8 +7,8 @@ package main import ( "log" + "github.com/hyperledger-firefly/firefly/chaincode-go/chaincode" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/firefly/chaincode-go/chaincode" ) func main() { diff --git a/smart_contracts/fabric/firefly-go/go.mod b/smart_contracts/fabric/firefly-go/go.mod index fee953f214..537e0b3a1c 100644 --- a/smart_contracts/fabric/firefly-go/go.mod +++ b/smart_contracts/fabric/firefly-go/go.mod @@ -1,4 +1,4 @@ -module github.com/hyperledger/firefly/chaincode-go +module github.com/hyperledger-firefly/firefly/chaincode-go go 1.26.0 diff --git a/test/data/contracts/assetcreator/assetCreator.go b/test/data/contracts/assetcreator/assetCreator.go index 21a8f77152..9da497d896 100644 --- a/test/data/contracts/assetcreator/assetCreator.go +++ b/test/data/contracts/assetcreator/assetCreator.go @@ -7,8 +7,8 @@ package main import ( "log" + "github.com/hyperledger-firefly/firefly/test/data/assetcreator/chaincode" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/firefly/test/data/assetcreator/chaincode" ) func main() { diff --git a/test/data/contracts/assetcreator/go.mod b/test/data/contracts/assetcreator/go.mod index 8d8961ecdf..cf0fc16e64 100644 --- a/test/data/contracts/assetcreator/go.mod +++ b/test/data/contracts/assetcreator/go.mod @@ -1,4 +1,4 @@ -module github.com/hyperledger/firefly/test/data/assetcreator +module github.com/hyperledger-firefly/firefly/test/data/assetcreator go 1.26.0 diff --git a/test/e2e/client/restclient.go b/test/e2e/client/restclient.go index cd2fad6d7d..5d1bced2bf 100644 --- a/test/e2e/client/restclient.go +++ b/test/e2e/client/restclient.go @@ -33,8 +33,8 @@ import ( "github.com/go-resty/resty/v2" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index c595ad4644..912cd90ff7 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -28,9 +28,9 @@ import ( "github.com/go-resty/resty/v2" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/test/e2e/gateway/common.go b/test/e2e/gateway/common.go index 9b707a2887..a75889bc89 100644 --- a/test/e2e/gateway/common.go +++ b/test/e2e/gateway/common.go @@ -26,8 +26,8 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" ) const ( diff --git a/test/e2e/gateway/ethereum_coupon.go b/test/e2e/gateway/ethereum_coupon.go index e15fea2612..093219a097 100644 --- a/test/e2e/gateway/ethereum_coupon.go +++ b/test/e2e/gateway/ethereum_coupon.go @@ -24,10 +24,10 @@ import ( "github.com/aidarkhanov/nanoid" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/test/e2e/gateway/ethereum_revert.go b/test/e2e/gateway/ethereum_revert.go index f5f72034bb..2ffc2e2f50 100644 --- a/test/e2e/gateway/ethereum_revert.go +++ b/test/e2e/gateway/ethereum_revert.go @@ -21,10 +21,10 @@ import ( "fmt" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/gateway/ethereum_simplestorage.go b/test/e2e/gateway/ethereum_simplestorage.go index f691f4aba4..93f982a9fc 100644 --- a/test/e2e/gateway/ethereum_simplestorage.go +++ b/test/e2e/gateway/ethereum_simplestorage.go @@ -25,10 +25,10 @@ import ( "github.com/aidarkhanov/nanoid" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/test/e2e/gateway/fabric_contracts.go b/test/e2e/gateway/fabric_contracts.go index 7a216e2b16..3e623823b6 100644 --- a/test/e2e/gateway/fabric_contracts.go +++ b/test/e2e/gateway/fabric_contracts.go @@ -25,10 +25,10 @@ import ( "github.com/aidarkhanov/nanoid" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/test/e2e/gateway/tokens.go b/test/e2e/gateway/tokens.go index d8673d95fe..ab96af57d0 100644 --- a/test/e2e/gateway/tokens.go +++ b/test/e2e/gateway/tokens.go @@ -19,10 +19,10 @@ package gateway import ( "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/gateway/tokens_only.go b/test/e2e/gateway/tokens_only.go index 0e8c54af58..be2b5e65ca 100644 --- a/test/e2e/gateway/tokens_only.go +++ b/test/e2e/gateway/tokens_only.go @@ -19,10 +19,10 @@ package gateway import ( "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/multiparty/common.go b/test/e2e/multiparty/common.go index 41b3b667ac..1d93accb76 100644 --- a/test/e2e/multiparty/common.go +++ b/test/e2e/multiparty/common.go @@ -28,10 +28,10 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" ) diff --git a/test/e2e/multiparty/contract_migration.go b/test/e2e/multiparty/contract_migration.go index e9ec6ae0e9..50787d3793 100644 --- a/test/e2e/multiparty/contract_migration.go +++ b/test/e2e/multiparty/contract_migration.go @@ -20,10 +20,10 @@ import ( "fmt" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/test/e2e/multiparty/contract_migration_v1.go b/test/e2e/multiparty/contract_migration_v1.go index 007f6f2025..31f8f1bb2a 100644 --- a/test/e2e/multiparty/contract_migration_v1.go +++ b/test/e2e/multiparty/contract_migration_v1.go @@ -17,8 +17,8 @@ package multiparty import ( - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" ) type ContractMigrationV1TestSuite struct { diff --git a/test/e2e/multiparty/ethereum_contract_message.go b/test/e2e/multiparty/ethereum_contract_message.go index 0b442a0dc6..538fb8b4cf 100644 --- a/test/e2e/multiparty/ethereum_contract_message.go +++ b/test/e2e/multiparty/ethereum_contract_message.go @@ -17,10 +17,10 @@ package multiparty import ( - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/multiparty/ethereum_contracts.go b/test/e2e/multiparty/ethereum_contracts.go index 06a605395d..d4516536b1 100644 --- a/test/e2e/multiparty/ethereum_contracts.go +++ b/test/e2e/multiparty/ethereum_contracts.go @@ -26,10 +26,10 @@ import ( "github.com/aidarkhanov/nanoid" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/test/e2e/multiparty/ethereum_token_contract.go b/test/e2e/multiparty/ethereum_token_contract.go index 1aa88e2667..c463e6736d 100644 --- a/test/e2e/multiparty/ethereum_token_contract.go +++ b/test/e2e/multiparty/ethereum_token_contract.go @@ -20,10 +20,10 @@ import ( "fmt" "strings" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/multiparty/fabric_contract_message.go b/test/e2e/multiparty/fabric_contract_message.go index c7d98334c6..4510c63b97 100644 --- a/test/e2e/multiparty/fabric_contract_message.go +++ b/test/e2e/multiparty/fabric_contract_message.go @@ -19,10 +19,10 @@ package multiparty import ( "encoding/json" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/multiparty/fabric_contracts.go b/test/e2e/multiparty/fabric_contracts.go index 8be15a754e..9fcb19ce1d 100644 --- a/test/e2e/multiparty/fabric_contracts.go +++ b/test/e2e/multiparty/fabric_contracts.go @@ -25,10 +25,10 @@ import ( "github.com/aidarkhanov/nanoid" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/test/e2e/multiparty/identity.go b/test/e2e/multiparty/identity.go index 89c804bc73..f0db0dcece 100644 --- a/test/e2e/multiparty/identity.go +++ b/test/e2e/multiparty/identity.go @@ -22,10 +22,10 @@ import ( "strings" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/test/e2e/multiparty/multi_tenancy.go b/test/e2e/multiparty/multi_tenancy.go index 36317e7a38..d86f8452e4 100644 --- a/test/e2e/multiparty/multi_tenancy.go +++ b/test/e2e/multiparty/multi_tenancy.go @@ -19,10 +19,10 @@ package multiparty import ( "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/test/e2e/multiparty/onchain_offchain.go b/test/e2e/multiparty/onchain_offchain.go index afc9f6a57a..88218b88c2 100644 --- a/test/e2e/multiparty/onchain_offchain.go +++ b/test/e2e/multiparty/onchain_offchain.go @@ -28,10 +28,10 @@ import ( image2ascii "github.com/qeesung/image2ascii/convert" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" @@ -314,7 +314,7 @@ func (suite *OnChainOffChainTestSuite) TestE2EWebhookExchange() { "name": "myhook", "options": { "withData": true, - "url": "https://raw.githubusercontent.com/hyperledger/firefly/main/test/data/config/firefly.core.yaml", + "url": "https://raw.githubusercontent.com/hyperledger-firefly/firefly/main/test/data/config/firefly.core.yaml", "reply": true, "replytag": "myreply", "method": "GET" @@ -369,7 +369,7 @@ func (suite *OnChainOffChainTestSuite) TestE2EWebhookRequestReplyNoTx() { "name": "myhook", "options": { "withData": true, - "url": "https://github.com/hyperledger/firefly/raw/main/resources/ff-logo-32.png", + "url": "https://github.com/hyperledger-firefly/firefly/raw/main/resources/ff-logo-32.png", "reply": true, "replytag": "myreply", "replytx": "none", diff --git a/test/e2e/multiparty/tokens.go b/test/e2e/multiparty/tokens.go index f05e803264..b24797f1e6 100644 --- a/test/e2e/multiparty/tokens.go +++ b/test/e2e/multiparty/tokens.go @@ -19,10 +19,10 @@ package multiparty import ( "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/multiparty/tokens_remote_name.go b/test/e2e/multiparty/tokens_remote_name.go index 8af34688fe..e9719d39c0 100644 --- a/test/e2e/multiparty/tokens_remote_name.go +++ b/test/e2e/multiparty/tokens_remote_name.go @@ -19,10 +19,10 @@ package multiparty import ( "fmt" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly/pkg/core" - "github.com/hyperledger/firefly/test/e2e" - "github.com/hyperledger/firefly/test/e2e/client" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/firefly/pkg/core" + "github.com/hyperledger-firefly/firefly/test/e2e" + "github.com/hyperledger-firefly/firefly/test/e2e/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/run.sh b/test/e2e/run.sh index b6dee5f39b..a042083949 100755 --- a/test/e2e/run.sh +++ b/test/e2e/run.sh @@ -92,7 +92,7 @@ if [ "$BUILD_FIREFLY" == "true" ]; then fi if [ "$DOWNLOAD_CLI" == "true" ]; then - go install github.com/hyperledger/firefly-cli/ff@$CLI_VERSION + go install github.com/hyperledger-firefly/cli/ff@$CLI_VERSION checkOk $? fi diff --git a/test/e2e/runners/ethereum_gateway_test.go b/test/e2e/runners/ethereum_gateway_test.go index 00aca2d4c2..94e89c6dd2 100644 --- a/test/e2e/runners/ethereum_gateway_test.go +++ b/test/e2e/runners/ethereum_gateway_test.go @@ -19,7 +19,7 @@ package runners import ( "testing" - "github.com/hyperledger/firefly/test/e2e/gateway" + "github.com/hyperledger-firefly/firefly/test/e2e/gateway" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/runners/ethereum_multiparty_test.go b/test/e2e/runners/ethereum_multiparty_test.go index 0e65411715..c627183020 100644 --- a/test/e2e/runners/ethereum_multiparty_test.go +++ b/test/e2e/runners/ethereum_multiparty_test.go @@ -19,7 +19,7 @@ package runners import ( "testing" - "github.com/hyperledger/firefly/test/e2e/multiparty" + "github.com/hyperledger-firefly/firefly/test/e2e/multiparty" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/runners/ethereum_multiparty_tokens_remote_name_test.go b/test/e2e/runners/ethereum_multiparty_tokens_remote_name_test.go index c120f47440..9973d9f0ae 100644 --- a/test/e2e/runners/ethereum_multiparty_tokens_remote_name_test.go +++ b/test/e2e/runners/ethereum_multiparty_tokens_remote_name_test.go @@ -19,7 +19,7 @@ package runners import ( "testing" - "github.com/hyperledger/firefly/test/e2e/multiparty" + "github.com/hyperledger-firefly/firefly/test/e2e/multiparty" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/runners/ethereum_namespace.go b/test/e2e/runners/ethereum_namespace.go index 2476ad9ba6..2eef1e5305 100644 --- a/test/e2e/runners/ethereum_namespace.go +++ b/test/e2e/runners/ethereum_namespace.go @@ -19,7 +19,7 @@ package runners import ( "testing" - "github.com/hyperledger/firefly/test/e2e/multiparty" + "github.com/hyperledger-firefly/firefly/test/e2e/multiparty" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/runners/ethereum_v1_migration_test.go b/test/e2e/runners/ethereum_v1_migration_test.go index 9a09620b22..fa971dd639 100644 --- a/test/e2e/runners/ethereum_v1_migration_test.go +++ b/test/e2e/runners/ethereum_v1_migration_test.go @@ -19,7 +19,7 @@ package runners import ( "testing" - "github.com/hyperledger/firefly/test/e2e/multiparty" + "github.com/hyperledger-firefly/firefly/test/e2e/multiparty" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/runners/fabric_gateway_test.go b/test/e2e/runners/fabric_gateway_test.go index e9be008689..971520e254 100644 --- a/test/e2e/runners/fabric_gateway_test.go +++ b/test/e2e/runners/fabric_gateway_test.go @@ -19,7 +19,7 @@ package runners import ( "testing" - "github.com/hyperledger/firefly/test/e2e/gateway" + "github.com/hyperledger-firefly/firefly/test/e2e/gateway" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/runners/fabric_multiparty_global_listener_test.go b/test/e2e/runners/fabric_multiparty_global_listener_test.go index 99abda566e..b489752ea4 100644 --- a/test/e2e/runners/fabric_multiparty_global_listener_test.go +++ b/test/e2e/runners/fabric_multiparty_global_listener_test.go @@ -19,7 +19,7 @@ package runners import ( "testing" - "github.com/hyperledger/firefly/test/e2e/multiparty" + "github.com/hyperledger-firefly/firefly/test/e2e/multiparty" "github.com/stretchr/testify/suite" ) diff --git a/test/e2e/runners/fabric_multiparty_test.go b/test/e2e/runners/fabric_multiparty_test.go index 8c848ce18a..cde3283104 100644 --- a/test/e2e/runners/fabric_multiparty_test.go +++ b/test/e2e/runners/fabric_multiparty_test.go @@ -19,7 +19,7 @@ package runners import ( "testing" - "github.com/hyperledger/firefly/test/e2e/multiparty" + "github.com/hyperledger-firefly/firefly/test/e2e/multiparty" "github.com/stretchr/testify/suite" )