diff --git a/.goreleaser.yml b/.goreleaser.yml index 99669a3..b02cf44 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -28,7 +28,7 @@ builds: main: ./ffperf binary: ffperf ldflags: - - "-s -w -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Version={{.Version}}' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Commit={{.Commit}}' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Date={{.Date}}'" + - "-s -w -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Version={{.Version}}' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Commit={{.Commit}}' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Date={{.Date}}'" archives: - name_template: >- {{ .ProjectName }}_{{ .Version }}_ diff --git a/GettingStarted.md b/GettingStarted.md index e437add..0499309 100644 --- a/GettingStarted.md +++ b/GettingStarted.md @@ -21,8 +21,8 @@ ```bash # From the firefly-perf-cli folder mkdir ~/ffperf-testing - git clone git@github.com:hyperledger/firefly.git ~/ffperf-testing/firefly - git clone git@github.com:hyperledger/firefly-perf-cli.git ~/ffperf-testing/firefly-perf-cli + git clone git@github.com:hyperledger-firefly/firefly.git ~/ffperf-testing/firefly + git clone git@github.com:hyperledger-firefly/perf-cli.git ~/ffperf-testing/firefly-perf-cli cp scripts/getLogs.sh ~/ffperf-testing/getLogs.sh cp scripts/prep.sh ~/ffperf-testing/prep.sh ``` @@ -65,7 +65,7 @@ git checkout ... # ex: ./prep.sh oldStack newStack geth ``` - Once script is done, you'll be given a command to run the perf test. Paste that in to the terminal to start the test. -- \*\*Please save the markdown row that is printed. You will need to use this to create an issue in https://github.com/hyperledger/firefly/issues/519 +- \*\*Please save the markdown row that is printed. You will need to use this to create an issue in https://github.com/hyperledger-firefly/firefly/issues/519 ## Getting Logs diff --git a/GettingStartedRemoteNode.md b/GettingStartedRemoteNode.md index 0678dc8..ba7681c 100644 --- a/GettingStartedRemoteNode.md +++ b/GettingStartedRemoteNode.md @@ -26,7 +26,7 @@ Note: you must create a FireFly token pool before running either of the remote e ```bash # From the firefly-perf-cli folder mkdir ~/ffperf-testing - git clone git@github.com:hyperledger/firefly-perf-cli.git ~/ffperf-testing/firefly-perf-cli + git clone git@github.com:hyperledger-firefly/perf-cli.git ~/ffperf-testing/firefly-perf-cli cp scripts/getLogs.sh ~/ffperf-testing/getLogs.sh cp scripts/prepForRemote.sh ~/ffperf-testing/prepForRemote.sh ``` diff --git a/Makefile b/Makefile index 0c58c91..ce3a2e9 100644 --- a/Makefile +++ b/Makefile @@ -23,12 +23,12 @@ LINT := $(GOBIN)/golangci-lint all: build build: ## Builds all go code - cd ffperf && go build -ldflags="-X 'github.com/hyperledger/firefly-perf-cli/internal/version.Version=$(VERSION)' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Date=$(DATE)' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Commit=$(GITREF)'" + cd ffperf && go build -ldflags="-X 'github.com/hyperledger-firefly/perf-cli/internal/version.Version=$(VERSION)' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Date=$(DATE)' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Commit=$(GITREF)'" install: ## Installs the package - cd ffperf && go install -ldflags="-X 'github.com/hyperledger/firefly-perf-cli/internal/version.Version=$(VERSION)' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Date=$(DATE)' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Commit=$(GITREF)'" + cd ffperf && go install -ldflags="-X 'github.com/hyperledger-firefly/perf-cli/internal/version.Version=$(VERSION)' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Date=$(DATE)' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Commit=$(GITREF)'" docker: - docker build --platform linux/amd64 --build-arg BUILD_VERSION=$(VERSION) . -t ghcr.io/hyperledger/firefly-perf-cli + docker build --platform linux/amd64 --build-arg BUILD_VERSION=$(VERSION) . -t ghcr.io/hyperledger-firefly/perf-cli lint: ${LINT} ## Checks and reports lint errors GOGC=20 $(LINT) run -v --timeout 5m diff --git a/README.md b/README.md index b0ff06b..2482e7b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # FireFly Performance CLI -FireFly Performance CLI is a HTTP load testing tool that generates a constant request rate against a [FireFly](https://github.com/hyperledger/firefly) -network and measure performance. This is used to confirm confidence that [FireFly](https://github.com/hyperledger/firefly) +FireFly Performance CLI is a HTTP load testing tool that generates a constant request rate against a [FireFly](https://github.com/hyperledger-firefly/firefly) +network and measure performance. This is used to confirm confidence that [FireFly](https://github.com/hyperledger-firefly/firefly) can perform under normal conditions for an extended period of time. ## Items Subject to Testing @@ -39,7 +39,7 @@ See the [`Getting Started`](GettingStarted.md) guide for help running tests agai In the test configuration you define one or more test _instances_ for a single `ffperf` process to run. An instance then describes running one or more test _cases_ with a dedicated number of goroutine _workers_ against a _sender_ org and a _recipient_ org. The test configuration consumes a file reference to the stack JSON configuration produced by the -[`ff` CLI](https://github.com/hyperledger/firefly-cli) (or can be defined manually) to understand the network topology, so that +[`ff` CLI](https://github.com/hyperledger-firefly/cli) (or can be defined manually) to understand the network topology, so that sender's and recipient's just refer to indices within the stack. As a result, running the CLI consists of providing an `instances.yaml` file describe the test configuration diff --git a/charts/ffperf/values.yaml b/charts/ffperf/values.yaml index 8e27026..451cc84 100644 --- a/charts/ffperf/values.yaml +++ b/charts/ffperf/values.yaml @@ -55,7 +55,7 @@ instances: [] daemonModeEnabled: false image: - repository: ghcr.io/hyperledger/firefly-perf-cli + repository: ghcr.io/hyperledger-firefly/perf-cli pullPolicy: Always # TODO # Overrides the image tag whose default is the chart appVersion. tag: "v0.0.1-alpha" # TODO diff --git a/cmd/run.go b/cmd/run.go index c75d663..8062ead 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -24,12 +24,12 @@ import ( "path" "time" - "github.com/hyperledger/firefly-perf-cli/internal/conf" - "github.com/hyperledger/firefly-perf-cli/internal/perf" - "github.com/hyperledger/firefly-perf-cli/internal/server" - "github.com/hyperledger/firefly-perf-cli/internal/types" - "github.com/hyperledger/firefly-perf-cli/internal/util" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/perf-cli/internal/conf" + "github.com/hyperledger-firefly/perf-cli/internal/perf" + "github.com/hyperledger-firefly/perf-cli/internal/server" + "github.com/hyperledger-firefly/perf-cli/internal/types" + "github.com/hyperledger-firefly/perf-cli/internal/util" + "github.com/hyperledger-firefly/firefly/pkg/core" "github.com/pkg/errors" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/version.go b/cmd/version.go index 5e8905e..86060d8 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -20,7 +20,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/hyperledger/firefly-perf-cli/internal/version" + "github.com/hyperledger-firefly/perf-cli/internal/version" "gopkg.in/yaml.v3" "github.com/spf13/cobra" diff --git a/ffperf/main.go b/ffperf/main.go index ea9a7c3..8fafbe0 100644 --- a/ffperf/main.go +++ b/ffperf/main.go @@ -19,7 +19,7 @@ package main import ( "os" - "github.com/hyperledger/firefly-perf-cli/cmd" + "github.com/hyperledger-firefly/perf-cli/cmd" ) func main() { diff --git a/go.mod b/go.mod index 08aaa85..5845122 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ -module github.com/hyperledger/firefly-perf-cli +module github.com/hyperledger-firefly/perf-cli -go 1.21 +go 1.26.0 -toolchain go1.21.6 +toolchain go1.26.4 require ( github.com/go-resty/resty/v2 v2.11.0 - github.com/hyperledger/firefly v1.3.0-rc.1 - github.com/hyperledger/firefly-common v1.4.6 + github.com/hyperledger-firefly/common v1.6.3 + github.com/hyperledger-firefly/firefly v1.5.0-rc.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.18.0 github.com/prometheus/client_model v0.5.0 @@ -18,23 +18,27 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) +require ( + github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect + github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect +) + require ( github.com/aidarkhanov/nanoid v1.0.8 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/go-units v0.5.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/getkin/kin-openapi v0.122.0 // indirect + github.com/getkin/kin-openapi v0.131.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect - github.com/go-openapi/jsonpointer v0.20.2 // indirect - github.com/go-openapi/swag v0.22.7 // indirect - github.com/google/uuid v1.5.0 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/yaml v0.2.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -50,7 +54,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/rs/cors v1.10.1 // indirect + github.com/rs/cors v1.11.1 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -58,19 +62,19 @@ require ( github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/testify v1.8.4 // indirect + github.com/stretchr/testify v1.9.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect gitlab.com/hfuss/mux-prometheus v0.0.5 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.18.0 // indirect + golang.org/x/crypto v0.52.0 // indirect golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sync v0.7.0 - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.16.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect + golang.org/x/net v0.55.0 // indirect + golang.org/x/sync v0.20.0 + golang.org/x/sys v0.45.0 // indirect + golang.org/x/term v0.43.0 // indirect + golang.org/x/text v0.37.0 // indirect + google.golang.org/protobuf v1.36.10 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index bc94a92..86b9667 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/aidarkhanov/nanoid v1.0.8 h1:yxyJkgsEDFXP7+97vc6JevMcjyb03Zw+/9fqhlVX github.com/aidarkhanov/nanoid v1.0.8/go.mod h1:vadfZHT+m4uDhttg0yY4wW3GKtl2T6i4d2Age+45pYk= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -16,36 +16,34 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/getkin/kin-openapi v0.122.0 h1:WB9Jbl0Hp/T79/JF9xlSW5Kl9uYdk/AWD0yAd9HOM10= -github.com/getkin/kin-openapi v0.122.0/go.mod h1:PCWw/lfBrJY4HcdqE3jj+QFkaFK8ABoqo7PvqVhXXqw= +github.com/getkin/kin-openapi v0.131.0 h1:NO2UeHnFKRYhZ8wg6Nyh5Cq7dHk4suQQr72a4pMrDxE= +github.com/getkin/kin-openapi v0.131.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= -github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs= -github.com/go-openapi/swag v0.22.7 h1:JWrc1uc/P9cSomxfnsFSVWoE1FW6bNbrVPmpQYpCcR8= -github.com/go-openapi/swag v0.22.7/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8= github.com/go-resty/resty/v2 v2.11.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= 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 v1.3.0-rc.1 h1:fjsVoobrcK5sgiyeB8l5ibQ9VHuhusCG2gLo2tvMIJA= -github.com/hyperledger/firefly v1.3.0-rc.1/go.mod h1:2nKiNWQjKhiAYsTFbO+hCwDFVwCj0oqzWFrgyrbe3gU= -github.com/hyperledger/firefly-common v1.4.6 h1:qqXoSaRml3WjUnWcWxrrXs5AIOWa+UcMXLCF8yEa4Pk= -github.com/hyperledger/firefly-common v1.4.6/go.mod h1:jkErZdQmC9fsAJZQO427tURdwB9iiW+NMUZSqS3eBIE= +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/firefly v1.5.0-rc.1 h1:j2JDK1ZfSLPyioH7i2F9A5qe7yYCUAl+xATbtDBSrWA= +github.com/hyperledger-firefly/firefly v1.5.0-rc.1/go.mod h1:mAax6+PwgGJ1Wiem1eObO8uqQWz7EBz0qNf9pYDj9Lc= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY= -github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= github.com/jarcoal/httpmock v1.2.0 h1:gSvTxxFR/MEMfsGrvRbdfpRUMBStovlSRLw0Ep1bwwc= github.com/jarcoal/httpmock v1.2.0/go.mod h1:oCoTsnAz4+UoOUIf5lJOWV2QQIW5UoeUI6aM2YnWAZk= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -73,6 +71,10 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY= +github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw= +github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c= +github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= @@ -94,10 +96,10 @@ github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lne github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= +github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= @@ -122,13 +124,14 @@ github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMV github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= -github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= @@ -143,8 +146,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= +golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e h1:723BNChdd0c2Wk6WOE320qGBiPtYx0F0Bbm1kriShfE= golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -155,13 +158,13 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -174,23 +177,23 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= @@ -199,8 +202,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -213,7 +216,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= diff --git a/internal/conf/conf.go b/internal/conf/conf.go index 44e39c5..7b6713d 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -22,9 +22,9 @@ import ( "net/url" "time" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/firefly/pkg/core" ) type RunnerConfig struct { diff --git a/internal/perf/blob_broadcast_msg.go b/internal/perf/blob_broadcast_msg.go index ebda500..b96f81d 100644 --- a/internal/perf/blob_broadcast_msg.go +++ b/internal/perf/blob_broadcast_msg.go @@ -5,10 +5,10 @@ import ( "math/big" "net/url" - "github.com/hyperledger/firefly-perf-cli/internal/conf" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/perf-cli/internal/conf" + "github.com/hyperledger-firefly/firefly/pkg/core" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type blobBroadcast struct { diff --git a/internal/perf/blob_private_msg.go b/internal/perf/blob_private_msg.go index 1c0d735..2cd41f3 100644 --- a/internal/perf/blob_private_msg.go +++ b/internal/perf/blob_private_msg.go @@ -5,10 +5,10 @@ import ( "math/big" "net/url" - "github.com/hyperledger/firefly-perf-cli/internal/conf" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/perf-cli/internal/conf" + "github.com/hyperledger-firefly/firefly/pkg/core" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type blobPrivate struct { diff --git a/internal/perf/broadcast_msg.go b/internal/perf/broadcast_msg.go index 3656d03..243aba1 100644 --- a/internal/perf/broadcast_msg.go +++ b/internal/perf/broadcast_msg.go @@ -4,10 +4,10 @@ import ( "fmt" "net/url" - "github.com/hyperledger/firefly-perf-cli/internal/conf" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/perf-cli/internal/conf" + "github.com/hyperledger-firefly/firefly/pkg/core" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type broadcast struct { diff --git a/internal/perf/custom_ethereum_contract.go b/internal/perf/custom_ethereum_contract.go index ef238bf..72c54a6 100644 --- a/internal/perf/custom_ethereum_contract.go +++ b/internal/perf/custom_ethereum_contract.go @@ -22,10 +22,10 @@ import ( "net/url" "strconv" - "github.com/hyperledger/firefly-perf-cli/internal/conf" + "github.com/hyperledger-firefly/perf-cli/internal/conf" log "github.com/sirupsen/logrus" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type customEthereum struct { diff --git a/internal/perf/custom_fabric_contract.go b/internal/perf/custom_fabric_contract.go index 3b2ea23..bbaeb12 100644 --- a/internal/perf/custom_fabric_contract.go +++ b/internal/perf/custom_fabric_contract.go @@ -22,9 +22,9 @@ import ( "net/url" "strconv" - "github.com/hyperledger/firefly-perf-cli/internal/conf" + "github.com/hyperledger-firefly/perf-cli/internal/conf" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type customFabric struct { diff --git a/internal/perf/erc20transfer.go b/internal/perf/erc20transfer.go index 40e40b6..55aaf39 100644 --- a/internal/perf/erc20transfer.go +++ b/internal/perf/erc20transfer.go @@ -21,10 +21,10 @@ import ( "fmt" "net/url" - "github.com/hyperledger/firefly-perf-cli/internal/conf" + "github.com/hyperledger-firefly/perf-cli/internal/conf" log "github.com/sirupsen/logrus" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type erc20Transfer struct { diff --git a/internal/perf/perf.go b/internal/perf/perf.go index bd520ad..4df8c98 100644 --- a/internal/perf/perf.go +++ b/internal/perf/perf.go @@ -35,11 +35,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/go-resty/resty/v2" - "github.com/hyperledger/firefly-common/pkg/fftypes" - "github.com/hyperledger/firefly-common/pkg/wsclient" - "github.com/hyperledger/firefly-perf-cli/internal/conf" - "github.com/hyperledger/firefly-perf-cli/internal/util" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/wsclient" + "github.com/hyperledger-firefly/perf-cli/internal/conf" + "github.com/hyperledger-firefly/perf-cli/internal/util" + "github.com/hyperledger-firefly/firefly/pkg/core" dto "github.com/prometheus/client_model/go" log "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" @@ -121,7 +121,7 @@ func getMetricVal(collector prometheus.Collector) float64 { metric := dto.Metric{} err := (<-collectorChannel).Write(&metric) if err != nil { - log.Error("error writing metric: %s", err) + log.Errorf("error writing metric: %s", err) } if metric.Counter != nil { return *metric.Counter.Value @@ -706,7 +706,7 @@ func (pr *perfRunner) filterEvent(event core.EventDelivery, url string) (workerI switch event.Type { case core.EventTypeBlockchainEventReceived: if event.BlockchainEvent == nil { - log.Errorf("\nBlockchain event not found --- Event ID: %s\n\t%d --- Ref: %s", event.ID.String(), event.Reference) + log.Errorf("\nBlockchain event not found --- Event ID: %s --- Ref: %s", event.ID.String(), event.Reference) return workerID, fmt.Errorf("blockchain event not found for event: %s", event.ID) } var value string @@ -738,7 +738,7 @@ func (pr *perfRunner) filterEvent(event core.EventDelivery, url string) (workerI log.Infof("\n\t%d - Received from %s\n\t%d --- Event ID: %s\n\t%d --- Ref: %s", workerID, url, workerID, event.ID.String(), workerID, event.Reference) } } else { - log.Errorf("no URI in token transfer event: %s") + log.Errorf("no URI in token transfer event: %s", event.ID) b, _ := json.Marshal(&event) log.Errorf("Full event: %s", b) @@ -1611,7 +1611,7 @@ func (pr *perfRunner) createContractsSub(nodeURL, listenerID string) (subID stri } func (pr *perfRunner) constructSubscriptionsOptions() core.SubscriptionOptions { - readAhead := uint16(pr.totalWorkers) + readAhead := uint(pr.totalWorkers) firstEvent := core.SubOptsFirstEventNewest // Default options options := core.SubscriptionOptions{ diff --git a/internal/perf/private_msg.go b/internal/perf/private_msg.go index 838fce6..2a8d39f 100644 --- a/internal/perf/private_msg.go +++ b/internal/perf/private_msg.go @@ -4,10 +4,10 @@ import ( "fmt" "net/url" - "github.com/hyperledger/firefly-perf-cli/internal/conf" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/perf-cli/internal/conf" + "github.com/hyperledger-firefly/firefly/pkg/core" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type private struct { diff --git a/internal/perf/test_base.go b/internal/perf/test_base.go index 6e9c6fa..0716d42 100644 --- a/internal/perf/test_base.go +++ b/internal/perf/test_base.go @@ -9,8 +9,8 @@ import ( "net/url" "github.com/go-resty/resty/v2" - "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 testBase struct { @@ -77,7 +77,7 @@ func (t *testBase) uploadBlob(blob []byte, hash [32]byte, nodeURL string) (strin return "", nil } if resp.StatusCode() != 201 { - return "", fmt.Errorf(string(resp.Body())) + return "", fmt.Errorf("%s", resp.Body()) } if *data.Blob.Hash != hash { return "", fmt.Errorf("blob hash was not equal") @@ -102,7 +102,7 @@ func (t *testBase) downloadAndVerifyBlob(nodeURL, id string, expectedHash [32]by return err } if res.StatusCode() != 200 { - return fmt.Errorf(string(res.Body())) + return fmt.Errorf("%s", res.Body()) } actualHash := sha256.Sum256(blob) if actualHash != expectedHash { diff --git a/internal/perf/token_mint.go b/internal/perf/token_mint.go index 66ba563..ea241bf 100644 --- a/internal/perf/token_mint.go +++ b/internal/perf/token_mint.go @@ -20,10 +20,10 @@ import ( "fmt" "net/url" - "github.com/hyperledger/firefly-perf-cli/internal/conf" - "github.com/hyperledger/firefly/pkg/core" + "github.com/hyperledger-firefly/perf-cli/internal/conf" + "github.com/hyperledger-firefly/firefly/pkg/core" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type tokenMint struct { diff --git a/internal/perf/token_pool.go b/internal/perf/token_pool.go index 66b3e89..afe3cfc 100644 --- a/internal/perf/token_pool.go +++ b/internal/perf/token_pool.go @@ -21,8 +21,8 @@ import ( "fmt" "net/url" - "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" log "github.com/sirupsen/logrus" ) diff --git a/scripts/prep.sh b/scripts/prep.sh index efdea55..feee93a 100755 --- a/scripts/prep.sh +++ b/scripts/prep.sh @@ -155,6 +155,6 @@ echo '```' # Create markdown for Perf Test #printf "\n${RED}*** Before Starting Test ***${NC}\n" -#printf "${PURPLE}*** Add the following entry to https://github.com/hyperledger/firefly/issues/519 ***${NC}\n" +#printf "${PURPLE}*** Add the following entry to https://github.com/hyperledger-firefly/firefly/issues/519 ***${NC}\n" #printf "\n| $(uuidgen) | $(TZ=":US/Eastern" date +%m_%d_%Y_%I_%M_%p) | *Add Snapshot After Test* | $(TZ=":US/Eastern" date +%m_%d_%Y_%I_%M_%p) | *Add After Test* | *Add After Test* | $BLOCKCHAIN_PROVIDER | *Add Num Broadcasts* | *Add Num Private* | *Add Num Minters* | *Add Num On-Chain* | *Add related Github Issue* | $(cd $BASE_PATH/firefly;git rev-parse --short HEAD) | *Add After Test* | $(echo $(jq -r 'to_entries[] | "\(.key):\(.value .sha)"' $BASE_PATH/firefly/manifest.json)// )|\n"