diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml index b0efab90..9986ea93 100644 --- a/.github/workflows/docker_main.yml +++ b/.github/workflows/docker_main.yml @@ -9,7 +9,7 @@ jobs: docker: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set build tag id: build_tag_generator diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml index cfad2781..ec8f9359 100644 --- a/.github/workflows/docker_release.yml +++ b/.github/workflows/docker_release.yml @@ -8,7 +8,7 @@ jobs: docker: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 1e99ee66..3bb9200f 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -11,18 +11,19 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: - path: 'ethconnect' - - uses: actions/checkout@v2 + path: "ethconnect" + - uses: actions/checkout@v4 with: repository: kaleido-io/ethbinding - path: 'ethbinding' - + path: "ethbinding" + - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: "1.21" + check-latest: true - name: Install solc run: | diff --git a/Dockerfile b/Dockerfile index 7955e2c9..582645ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-buster AS builder +FROM golang:1.21-buster AS builder WORKDIR /ethconnect RUN apt-get update -y \ && apt-get install -y build-essential git \ diff --git a/Makefile b/Makefile index 80ec1ad9..fdff9f1f 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,9 @@ build-win: GOOS=windows GOARCH=amd64 $(VGO) build -o $(BINARY_WIN) -v ${MOCKERY}: - $(VGO) install github.com/vektra/mockery/cmd/mockery@latest + $(VGO) install github.com/vektra/mockery/v2@v2.39.2 sarama: - $(eval SARAMA_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/Shopify/sarama)) + $(eval SARAMA_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/IBM/sarama)) go-mod-tidy: .ALWAYS $(VGO) mod tidy diff --git a/go.mod b/go.mod index aa55f8c1..773b11e1 100644 --- a/go.mod +++ b/go.mod @@ -1,89 +1,100 @@ module github.com/hyperledger/firefly-ethconnect +go 1.21 + require ( - github.com/Shopify/sarama v1.37.2 + github.com/IBM/sarama v1.42.1 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 - github.com/go-openapi/jsonreference v0.20.0 - github.com/go-openapi/spec v0.20.7 - github.com/gorilla/websocket v1.5.0 - github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d - github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 + github.com/go-openapi/jsonreference v0.20.4 + github.com/go-openapi/spec v0.20.14 + github.com/gorilla/websocket v1.5.1 + github.com/hashicorp/golang-lru v1.0.2 + github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0 github.com/julienschmidt/httprouter v1.3.0 github.com/kaleido-io/ethbinding v0.0.0-20230508164550-ab9908f47a86 github.com/mholt/archiver v3.1.1+incompatible github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d github.com/oklog/ulid/v2 v2.1.0 - github.com/sirupsen/logrus v1.9.0 - github.com/spf13/cobra v1.5.0 - github.com/stretchr/testify v1.8.0 + github.com/sirupsen/logrus v1.9.3 + github.com/spf13/cobra v1.8.0 + github.com/stretchr/testify v1.8.4 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tidwall/gjson v1.14.3 + github.com/tidwall/gjson v1.17.0 github.com/x-cray/logrus-prefixed-formatter v0.5.2 gopkg.in/yaml.v2 v2.4.0 ) require ( - github.com/ethereum/go-ethereum v1.11.6 // indirect + github.com/ethereum/go-ethereum v1.13.10 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect - golang.org/x/crypto v0.6.0 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/term v0.6.0 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect + golang.org/x/crypto v0.18.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/term v0.16.0 // indirect ) require ( - github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/bits-and-blooms/bitset v1.13.0 // indirect + github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect + github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect + github.com/consensys/bavard v0.1.13 // indirect + github.com/consensys/gnark-crypto v0.12.1 // indirect + github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/deckarep/golang-set/v2 v2.1.0 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect + github.com/deckarep/golang-set/v2 v2.6.0 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/dsnet/compress v0.0.1 // indirect - github.com/eapache/go-resiliency v1.3.0 // indirect - github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect + github.com/eapache/go-resiliency v1.5.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect + github.com/ethereum/c-kzg-4844 v0.4.0 // indirect github.com/frankban/quicktest v1.14.3 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/swag v0.22.3 // indirect - github.com/go-stack/stack v1.8.1 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect + github.com/go-openapi/jsonpointer v0.20.2 // indirect + github.com/go-openapi/swag v0.22.7 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect - github.com/google/go-cmp v0.5.9 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/holiman/uint256 v1.2.4 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/gofork v1.7.6 // indirect - github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/josharian/intern v1.0.0 // indirect - github.com/klauspost/compress v1.15.15 // indirect + github.com/klauspost/compress v1.17.4 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect + github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/nwaples/rardecode v1.1.3 // indirect github.com/onsi/ginkgo v1.16.5 // indirect github.com/onsi/gomega v1.19.0 // indirect - github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect - github.com/stretchr/objx v0.4.0 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.5.0 // indirect - github.com/ulikunitz/xz v0.5.10 // indirect + github.com/stretchr/objx v0.5.1 // indirect + github.com/supranational/blst v0.3.11 // indirect + github.com/tklauser/go-sysconf v0.3.13 // indirect + github.com/tklauser/numcpus v0.7.0 // indirect + github.com/ulikunitz/xz v0.5.11 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - github.com/yusufpapurcu/wmi v1.2.2 // indirect + github.com/yusufpapurcu/wmi v1.2.3 // indirect + golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect + golang.org/x/mod v0.14.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/tools v0.17.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + rsc.io/tmplfunc v0.0.3 // indirect ) replace github.com/kaleido-io/ethbinding => ../ethbinding - -go 1.19 diff --git a/go.sum b/go.sum index b8981e9d..e0b9d05e 100644 --- a/go.sum +++ b/go.sum @@ -1,68 +1,95 @@ -github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= -github.com/Shopify/sarama v1.37.2 h1:LoBbU0yJPte0cE5TZCGdlzZRmMgMtZU/XgnUKZg9Cv4= -github.com/Shopify/sarama v1.37.2/go.mod h1:Nxye/E+YPru//Bpaorfhc3JsSGYwCaDDj+R4bK52U5o= -github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= -github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= +github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= +github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/IBM/sarama v1.42.1 h1:wugyWa15TDEHh2kvq2gAy1IHLjEjuYOYgXz/ruC/OSQ= +github.com/IBM/sarama v1.42.1/go.mod h1:Xxho9HkHd4K/MDUo/T/sOqwtX/17D33++E9Wib6hUdQ= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40= +github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= -github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= -github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= +github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +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/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ= +github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8= -github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= -github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 h1:ytcWPaNPhNoGMWEhDvS3zToKcDpRsLuRolQJBVGdozk= -github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cockroachdb/errors v1.8.1 h1:A5+txlVZfOqFBDa4mGz2bUWSp0aHElvHX2bKkdbQu+Y= +github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A= +github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo= +github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw= +github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM= +github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= +github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= +github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= +github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJF7HpyG8M= +github.com/consensys/gnark-crypto v0.12.1/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ= +github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= +github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= +github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI= -github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= -github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= +github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM= +github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= +github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q= github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= -github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0= -github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/go-resiliency v1.5.0 h1:dRsaR00whmQD+SgVKlq/vCRFNgtEb5yppyeVos3Yce0= +github.com/eapache/go-resiliency v1.5.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/ethereum/go-ethereum v1.11.6 h1:2VF8Mf7XiSUfmoNOy3D+ocfl9Qu8baQBrCNbo2CXQ8E= -github.com/ethereum/go-ethereum v1.11.6/go.mod h1:+a8pUj1tOyJ2RinsNQD4326YS+leSoKGiG/uVVb0x6Y= +github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY= +github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= +github.com/ethereum/go-ethereum v1.13.10 h1:Ppdil79nN+Vc+mXfge0AuUgmKWuVv4eMqzoIVSdqZek= +github.com/ethereum/go-ethereum v1.13.10/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/getsentry/sentry-go v0.18.0 h1:MtBW5H9QgdcJabtZcuJG80BMOwaBpkRDZkxRkNC1sN0= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE= +github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46/go.mod h1:QNpY22eby74jVhqH4WhDLDwxc/vqsern6pW+u2kbkpc= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= -github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= -github.com/go-openapi/spec v0.20.7 h1:1Rlu/ZrOCCob0n+JKKJAWhNWMPW8bOZRg8FJaY+0SKI= -github.com/go-openapi/spec v0.20.7/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= -github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= +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/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU= +github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4= +github.com/go-openapi/spec v0.20.14 h1:7CBlRnw+mtjFGlPDRZmAMnq35cRzI91xj03HVyUi/Do= +github.com/go-openapi/spec v0.20.14/go.mod h1:8EOhTpBoFiask8rrgwbLC3zmJfz4zsCUueRuPM6GNkw= +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-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= @@ -70,7 +97,8 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -80,10 +108,13 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= 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/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +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/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -92,16 +123,15 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= -github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c h1:DZfsyhDK1hnSS5lH8l+JggqzEleHteTYfutAiVlSUM8= -github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= +github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= +github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 h1:H+uM0Bv88eur3ZSsd2NGKg3YIiuXxwxtlN7HjE66UTU= -github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845/go.mod h1:c1tRKs5Tx7E2+uHGSyyncziFjvGpgv4H2HrqXeUQ/Uk= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0 h1:nHoRIX8iXob3Y2kdt9KsjyIb7iApSvb3vgsd93xb5Ow= +github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0/go.mod h1:c1tRKs5Tx7E2+uHGSyyncziFjvGpgv4H2HrqXeUQ/Uk= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= @@ -110,8 +140,8 @@ github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVET github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8= -github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= +github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= +github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -119,33 +149,39 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= -github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= +github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= +github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU= github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= +github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= +github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= @@ -156,6 +192,7 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+ github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU= github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= @@ -168,71 +205,89 @@ github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9 github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/client_golang v1.12.0 h1:C+UIj/QWtmqY13Arb8kwMt5j34/0Z2iKamrJ+ryC0Gg= +github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a h1:CmF68hwI0XsOQ5UwlBopMi2Ow4Pbg32akc4KIVCOm+Y= +github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +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/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +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/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= +github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw= -github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= +github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= -github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= -github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A= -github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo= +github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4= +github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0= +github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4= +github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= -github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= +github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg= github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= -github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= +github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= +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/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= +golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -240,14 +295,18 @@ golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +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/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -261,28 +320,34 @@ golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +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.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -293,15 +358,14 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/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= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -310,6 +374,7 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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-20200615113413-eeeca48fe776/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= +rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= +rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= diff --git a/internal/kafka/client.go b/internal/kafka/client.go index 68fc1543..fa19769d 100644 --- a/internal/kafka/client.go +++ b/internal/kafka/client.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" log "github.com/sirupsen/logrus" ) diff --git a/internal/kafka/client_test.go b/internal/kafka/client_test.go index 6f7b15b8..c472915c 100644 --- a/internal/kafka/client_test.go +++ b/internal/kafka/client_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/hyperledger/firefly-ethconnect/mocks/saramamocks" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/kafka/clientmock.go b/internal/kafka/clientmock.go index 37008443..f3e9a013 100644 --- a/internal/kafka/clientmock.go +++ b/internal/kafka/clientmock.go @@ -17,7 +17,7 @@ package kafka import ( "sync" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" ) // MockKafkaFactory - mock diff --git a/internal/kafka/kafkabridge.go b/internal/kafka/kafkabridge.go index 88078774..53ea6dc8 100644 --- a/internal/kafka/kafkabridge.go +++ b/internal/kafka/kafkabridge.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/hyperledger/firefly-ethconnect/internal/auth" "github.com/hyperledger/firefly-ethconnect/internal/errors" "github.com/hyperledger/firefly-ethconnect/internal/eth" diff --git a/internal/kafka/kafkabridge_test.go b/internal/kafka/kafkabridge_test.go index c7dd7670..22ab5c9d 100644 --- a/internal/kafka/kafkabridge_test.go +++ b/internal/kafka/kafkabridge_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/hyperledger/firefly-ethconnect/internal/auth" "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" "github.com/hyperledger/firefly-ethconnect/internal/errors" diff --git a/internal/kafka/kafkacommon.go b/internal/kafka/kafkacommon.go index 97107a44..9c1d464f 100644 --- a/internal/kafka/kafkacommon.go +++ b/internal/kafka/kafkacommon.go @@ -24,7 +24,7 @@ import ( "syscall" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/hyperledger/firefly-ethconnect/internal/errors" "github.com/hyperledger/firefly-ethconnect/internal/utils" log "github.com/sirupsen/logrus" diff --git a/internal/kafka/kafkacommon_test.go b/internal/kafka/kafkacommon_test.go index 8c92095e..adf5abfd 100644 --- a/internal/kafka/kafkacommon_test.go +++ b/internal/kafka/kafkacommon_test.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/cobra" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/internal/rest/restgateway.go b/internal/rest/restgateway.go index 223b84ec..0ddfe8ec 100644 --- a/internal/rest/restgateway.go +++ b/internal/rest/restgateway.go @@ -37,7 +37,7 @@ import ( "github.com/hyperledger/firefly-ethconnect/internal/utils" "github.com/hyperledger/firefly-ethconnect/internal/ws" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/julienschmidt/httprouter" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/internal/rest/webhookskafka.go b/internal/rest/webhookskafka.go index 17c32a2e..01910c3c 100644 --- a/internal/rest/webhookskafka.go +++ b/internal/rest/webhookskafka.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/hyperledger/firefly-ethconnect/internal/auth" "github.com/hyperledger/firefly-ethconnect/internal/errors" "github.com/hyperledger/firefly-ethconnect/internal/kafka" diff --git a/internal/rest/webhookskafka_test.go b/internal/rest/webhookskafka_test.go index d887a4cb..20b7824e 100644 --- a/internal/rest/webhookskafka_test.go +++ b/internal/rest/webhookskafka_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/hyperledger/firefly-ethconnect/internal/auth" "github.com/hyperledger/firefly-ethconnect/internal/auth/authtest" "github.com/hyperledger/firefly-ethconnect/internal/errors" diff --git a/mocks/contractregistrymocks/contract_store.go b/mocks/contractregistrymocks/contract_store.go index 9347a34a..0f273b52 100644 --- a/mocks/contractregistrymocks/contract_store.go +++ b/mocks/contractregistrymocks/contract_store.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.39.2. DO NOT EDIT. package contractregistrymocks @@ -20,7 +20,15 @@ type ContractStore struct { func (_m *ContractStore) AddABI(id string, deployMsg *messages.DeployContract, createdTime time.Time) (*contractregistry.ABIInfo, error) { ret := _m.Called(id, deployMsg, createdTime) + if len(ret) == 0 { + panic("no return value specified for AddABI") + } + var r0 *contractregistry.ABIInfo + var r1 error + if rf, ok := ret.Get(0).(func(string, *messages.DeployContract, time.Time) (*contractregistry.ABIInfo, error)); ok { + return rf(id, deployMsg, createdTime) + } if rf, ok := ret.Get(0).(func(string, *messages.DeployContract, time.Time) *contractregistry.ABIInfo); ok { r0 = rf(id, deployMsg, createdTime) } else { @@ -29,7 +37,6 @@ func (_m *ContractStore) AddABI(id string, deployMsg *messages.DeployContract, c } } - var r1 error if rf, ok := ret.Get(1).(func(string, *messages.DeployContract, time.Time) error); ok { r1 = rf(id, deployMsg, createdTime) } else { @@ -43,7 +50,15 @@ func (_m *ContractStore) AddABI(id string, deployMsg *messages.DeployContract, c func (_m *ContractStore) AddContract(addrHexNo0x string, abiID string, pathName string, registerAs string) (*contractregistry.ContractInfo, error) { ret := _m.Called(addrHexNo0x, abiID, pathName, registerAs) + if len(ret) == 0 { + panic("no return value specified for AddContract") + } + var r0 *contractregistry.ContractInfo + var r1 error + if rf, ok := ret.Get(0).(func(string, string, string, string) (*contractregistry.ContractInfo, error)); ok { + return rf(addrHexNo0x, abiID, pathName, registerAs) + } if rf, ok := ret.Get(0).(func(string, string, string, string) *contractregistry.ContractInfo); ok { r0 = rf(addrHexNo0x, abiID, pathName, registerAs) } else { @@ -52,7 +67,6 @@ func (_m *ContractStore) AddContract(addrHexNo0x string, abiID string, pathName } } - var r1 error if rf, ok := ret.Get(1).(func(string, string, string, string) error); ok { r1 = rf(addrHexNo0x, abiID, pathName, registerAs) } else { @@ -66,6 +80,10 @@ func (_m *ContractStore) AddContract(addrHexNo0x string, abiID string, pathName func (_m *ContractStore) AddRemoteInstance(lookupStr string, address string) error { ret := _m.Called(lookupStr, address) + if len(ret) == 0 { + panic("no return value specified for AddRemoteInstance") + } + var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { r0 = rf(lookupStr, address) @@ -80,6 +98,10 @@ func (_m *ContractStore) AddRemoteInstance(lookupStr string, address string) err func (_m *ContractStore) CheckNameAvailable(name string, isRemote bool) error { ret := _m.Called(name, isRemote) + if len(ret) == 0 { + panic("no return value specified for CheckNameAvailable") + } + var r0 error if rf, ok := ret.Get(0).(func(string, bool) error); ok { r0 = rf(name, isRemote) @@ -99,7 +121,15 @@ func (_m *ContractStore) Close() { func (_m *ContractStore) GetABI(location contractregistry.ABILocation, refresh bool) (*contractregistry.DeployContractWithAddress, error) { ret := _m.Called(location, refresh) + if len(ret) == 0 { + panic("no return value specified for GetABI") + } + var r0 *contractregistry.DeployContractWithAddress + var r1 error + if rf, ok := ret.Get(0).(func(contractregistry.ABILocation, bool) (*contractregistry.DeployContractWithAddress, error)); ok { + return rf(location, refresh) + } if rf, ok := ret.Get(0).(func(contractregistry.ABILocation, bool) *contractregistry.DeployContractWithAddress); ok { r0 = rf(location, refresh) } else { @@ -108,7 +138,6 @@ func (_m *ContractStore) GetABI(location contractregistry.ABILocation, refresh b } } - var r1 error if rf, ok := ret.Get(1).(func(contractregistry.ABILocation, bool) error); ok { r1 = rf(location, refresh) } else { @@ -122,7 +151,15 @@ func (_m *ContractStore) GetABI(location contractregistry.ABILocation, refresh b func (_m *ContractStore) GetContractByAddress(addrHex string) (*contractregistry.ContractInfo, error) { ret := _m.Called(addrHex) + if len(ret) == 0 { + panic("no return value specified for GetContractByAddress") + } + var r0 *contractregistry.ContractInfo + var r1 error + if rf, ok := ret.Get(0).(func(string) (*contractregistry.ContractInfo, error)); ok { + return rf(addrHex) + } if rf, ok := ret.Get(0).(func(string) *contractregistry.ContractInfo); ok { r0 = rf(addrHex) } else { @@ -131,7 +168,6 @@ func (_m *ContractStore) GetContractByAddress(addrHex string) (*contractregistry } } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(addrHex) } else { @@ -145,7 +181,15 @@ func (_m *ContractStore) GetContractByAddress(addrHex string) (*contractregistry func (_m *ContractStore) GetLocalABIInfo(abiID string) (*contractregistry.ABIInfo, error) { ret := _m.Called(abiID) + if len(ret) == 0 { + panic("no return value specified for GetLocalABIInfo") + } + var r0 *contractregistry.ABIInfo + var r1 error + if rf, ok := ret.Get(0).(func(string) (*contractregistry.ABIInfo, error)); ok { + return rf(abiID) + } if rf, ok := ret.Get(0).(func(string) *contractregistry.ABIInfo); ok { r0 = rf(abiID) } else { @@ -154,7 +198,6 @@ func (_m *ContractStore) GetLocalABIInfo(abiID string) (*contractregistry.ABIInf } } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(abiID) } else { @@ -168,6 +211,10 @@ func (_m *ContractStore) GetLocalABIInfo(abiID string) (*contractregistry.ABIInf func (_m *ContractStore) Init() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Init") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() @@ -182,7 +229,15 @@ func (_m *ContractStore) Init() error { func (_m *ContractStore) ListABIs() ([]messages.TimeSortable, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for ListABIs") + } + var r0 []messages.TimeSortable + var r1 error + if rf, ok := ret.Get(0).(func() ([]messages.TimeSortable, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() []messages.TimeSortable); ok { r0 = rf() } else { @@ -191,7 +246,6 @@ func (_m *ContractStore) ListABIs() ([]messages.TimeSortable, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -205,7 +259,15 @@ func (_m *ContractStore) ListABIs() ([]messages.TimeSortable, error) { func (_m *ContractStore) ListContracts() ([]messages.TimeSortable, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for ListContracts") + } + var r0 []messages.TimeSortable + var r1 error + if rf, ok := ret.Get(0).(func() ([]messages.TimeSortable, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() []messages.TimeSortable); ok { r0 = rf() } else { @@ -214,7 +276,6 @@ func (_m *ContractStore) ListContracts() ([]messages.TimeSortable, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -228,14 +289,21 @@ func (_m *ContractStore) ListContracts() ([]messages.TimeSortable, error) { func (_m *ContractStore) ResolveContractAddress(registeredName string) (string, error) { ret := _m.Called(registeredName) + if len(ret) == 0 { + panic("no return value specified for ResolveContractAddress") + } + var r0 string + var r1 error + if rf, ok := ret.Get(0).(func(string) (string, error)); ok { + return rf(registeredName) + } if rf, ok := ret.Get(0).(func(string) string); ok { r0 = rf(registeredName) } else { r0 = ret.Get(0).(string) } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(registeredName) } else { @@ -244,3 +312,17 @@ func (_m *ContractStore) ResolveContractAddress(registeredName string) (string, return r0, r1 } + +// NewContractStore creates a new instance of ContractStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewContractStore(t interface { + mock.TestingT + Cleanup(func()) +}) *ContractStore { + mock := &ContractStore{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/mocks/contractregistrymocks/remote_registry.go b/mocks/contractregistrymocks/remote_registry.go index ec0607b8..c2f2d7a7 100644 --- a/mocks/contractregistrymocks/remote_registry.go +++ b/mocks/contractregistrymocks/remote_registry.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.39.2. DO NOT EDIT. package contractregistrymocks @@ -23,6 +23,10 @@ func (_m *RemoteRegistry) Close() { func (_m *RemoteRegistry) Init() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Init") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() @@ -37,7 +41,15 @@ func (_m *RemoteRegistry) Init() error { func (_m *RemoteRegistry) LoadFactoryForGateway(lookupStr string, refresh bool) (*messages.DeployContract, error) { ret := _m.Called(lookupStr, refresh) + if len(ret) == 0 { + panic("no return value specified for LoadFactoryForGateway") + } + var r0 *messages.DeployContract + var r1 error + if rf, ok := ret.Get(0).(func(string, bool) (*messages.DeployContract, error)); ok { + return rf(lookupStr, refresh) + } if rf, ok := ret.Get(0).(func(string, bool) *messages.DeployContract); ok { r0 = rf(lookupStr, refresh) } else { @@ -46,7 +58,6 @@ func (_m *RemoteRegistry) LoadFactoryForGateway(lookupStr string, refresh bool) } } - var r1 error if rf, ok := ret.Get(1).(func(string, bool) error); ok { r1 = rf(lookupStr, refresh) } else { @@ -60,7 +71,15 @@ func (_m *RemoteRegistry) LoadFactoryForGateway(lookupStr string, refresh bool) func (_m *RemoteRegistry) LoadFactoryForInstance(lookupStr string, refresh bool) (*contractregistry.DeployContractWithAddress, error) { ret := _m.Called(lookupStr, refresh) + if len(ret) == 0 { + panic("no return value specified for LoadFactoryForInstance") + } + var r0 *contractregistry.DeployContractWithAddress + var r1 error + if rf, ok := ret.Get(0).(func(string, bool) (*contractregistry.DeployContractWithAddress, error)); ok { + return rf(lookupStr, refresh) + } if rf, ok := ret.Get(0).(func(string, bool) *contractregistry.DeployContractWithAddress); ok { r0 = rf(lookupStr, refresh) } else { @@ -69,7 +88,6 @@ func (_m *RemoteRegistry) LoadFactoryForInstance(lookupStr string, refresh bool) } } - var r1 error if rf, ok := ret.Get(1).(func(string, bool) error); ok { r1 = rf(lookupStr, refresh) } else { @@ -83,6 +101,10 @@ func (_m *RemoteRegistry) LoadFactoryForInstance(lookupStr string, refresh bool) func (_m *RemoteRegistry) RegisterInstance(lookupStr string, address string) error { ret := _m.Called(lookupStr, address) + if len(ret) == 0 { + panic("no return value specified for RegisterInstance") + } + var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { r0 = rf(lookupStr, address) @@ -92,3 +114,17 @@ func (_m *RemoteRegistry) RegisterInstance(lookupStr string, address string) err return r0 } + +// NewRemoteRegistry creates a new instance of RemoteRegistry. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewRemoteRegistry(t interface { + mock.TestingT + Cleanup(func()) +}) *RemoteRegistry { + mock := &RemoteRegistry{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/mocks/ethmocks/rpc_client.go b/mocks/ethmocks/rpc_client.go index e128a48e..0fe9a102 100644 --- a/mocks/ethmocks/rpc_client.go +++ b/mocks/ethmocks/rpc_client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.39.2. DO NOT EDIT. package ethmocks @@ -20,6 +20,10 @@ func (_m *RPCClient) CallContext(ctx context.Context, result interface{}, method _ca = append(_ca, args...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for CallContext") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, interface{}, string, ...interface{}) error); ok { r0 = rf(ctx, result, method, args...) @@ -29,3 +33,17 @@ func (_m *RPCClient) CallContext(ctx context.Context, result interface{}, method return r0 } + +// NewRPCClient creates a new instance of RPCClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewRPCClient(t interface { + mock.TestingT + Cleanup(func()) +}) *RPCClient { + mock := &RPCClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/mocks/receiptsmocks/receipt_store_persistence.go b/mocks/receiptsmocks/receipt_store_persistence.go index 7f69a667..3e7df665 100644 --- a/mocks/receiptsmocks/receipt_store_persistence.go +++ b/mocks/receiptsmocks/receipt_store_persistence.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.39.2. DO NOT EDIT. package receiptsmocks @@ -13,6 +13,10 @@ type ReceiptStorePersistence struct { func (_m *ReceiptStorePersistence) AddReceipt(requestID string, receipt *map[string]interface{}, overwriteAndRetry bool) error { ret := _m.Called(requestID, receipt, overwriteAndRetry) + if len(ret) == 0 { + panic("no return value specified for AddReceipt") + } + var r0 error if rf, ok := ret.Get(0).(func(string, *map[string]interface{}, bool) error); ok { r0 = rf(requestID, receipt, overwriteAndRetry) @@ -27,7 +31,15 @@ func (_m *ReceiptStorePersistence) AddReceipt(requestID string, receipt *map[str func (_m *ReceiptStorePersistence) GetReceipt(requestID string) (*map[string]interface{}, error) { ret := _m.Called(requestID) + if len(ret) == 0 { + panic("no return value specified for GetReceipt") + } + var r0 *map[string]interface{} + var r1 error + if rf, ok := ret.Get(0).(func(string) (*map[string]interface{}, error)); ok { + return rf(requestID) + } if rf, ok := ret.Get(0).(func(string) *map[string]interface{}); ok { r0 = rf(requestID) } else { @@ -36,7 +48,6 @@ func (_m *ReceiptStorePersistence) GetReceipt(requestID string) (*map[string]int } } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(requestID) } else { @@ -50,7 +61,15 @@ func (_m *ReceiptStorePersistence) GetReceipt(requestID string) (*map[string]int func (_m *ReceiptStorePersistence) GetReceipts(skip int, limit int, ids []string, sinceEpochMS int64, from string, to string, start string) (*[]map[string]interface{}, error) { ret := _m.Called(skip, limit, ids, sinceEpochMS, from, to, start) + if len(ret) == 0 { + panic("no return value specified for GetReceipts") + } + var r0 *[]map[string]interface{} + var r1 error + if rf, ok := ret.Get(0).(func(int, int, []string, int64, string, string, string) (*[]map[string]interface{}, error)); ok { + return rf(skip, limit, ids, sinceEpochMS, from, to, start) + } if rf, ok := ret.Get(0).(func(int, int, []string, int64, string, string, string) *[]map[string]interface{}); ok { r0 = rf(skip, limit, ids, sinceEpochMS, from, to, start) } else { @@ -59,7 +78,6 @@ func (_m *ReceiptStorePersistence) GetReceipts(skip int, limit int, ids []string } } - var r1 error if rf, ok := ret.Get(1).(func(int, int, []string, int64, string, string, string) error); ok { r1 = rf(skip, limit, ids, sinceEpochMS, from, to, start) } else { @@ -68,3 +86,17 @@ func (_m *ReceiptStorePersistence) GetReceipts(skip int, limit int, ids []string return r0, r1 } + +// NewReceiptStorePersistence creates a new instance of ReceiptStorePersistence. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewReceiptStorePersistence(t interface { + mock.TestingT + Cleanup(func()) +}) *ReceiptStorePersistence { + mock := &ReceiptStorePersistence{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/mocks/saramamocks/client.go b/mocks/saramamocks/client.go index 05672c59..cb1cdc3c 100644 --- a/mocks/saramamocks/client.go +++ b/mocks/saramamocks/client.go @@ -1,9 +1,9 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.39.2. DO NOT EDIT. package saramamocks import ( - sarama "github.com/Shopify/sarama" + sarama "github.com/IBM/sarama" mock "github.com/stretchr/testify/mock" ) @@ -16,7 +16,15 @@ type Client struct { func (_m *Client) Broker(brokerID int32) (*sarama.Broker, error) { ret := _m.Called(brokerID) + if len(ret) == 0 { + panic("no return value specified for Broker") + } + var r0 *sarama.Broker + var r1 error + if rf, ok := ret.Get(0).(func(int32) (*sarama.Broker, error)); ok { + return rf(brokerID) + } if rf, ok := ret.Get(0).(func(int32) *sarama.Broker); ok { r0 = rf(brokerID) } else { @@ -25,7 +33,6 @@ func (_m *Client) Broker(brokerID int32) (*sarama.Broker, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(int32) error); ok { r1 = rf(brokerID) } else { @@ -39,6 +46,10 @@ func (_m *Client) Broker(brokerID int32) (*sarama.Broker, error) { func (_m *Client) Brokers() []*sarama.Broker { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Brokers") + } + var r0 []*sarama.Broker if rf, ok := ret.Get(0).(func() []*sarama.Broker); ok { r0 = rf() @@ -55,6 +66,10 @@ func (_m *Client) Brokers() []*sarama.Broker { func (_m *Client) Close() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Close") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() @@ -69,6 +84,10 @@ func (_m *Client) Close() error { func (_m *Client) Closed() bool { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Closed") + } + var r0 bool if rf, ok := ret.Get(0).(func() bool); ok { r0 = rf() @@ -83,6 +102,10 @@ func (_m *Client) Closed() bool { func (_m *Client) Config() *sarama.Config { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Config") + } + var r0 *sarama.Config if rf, ok := ret.Get(0).(func() *sarama.Config); ok { r0 = rf() @@ -99,7 +122,15 @@ func (_m *Client) Config() *sarama.Config { func (_m *Client) Controller() (*sarama.Broker, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Controller") + } + var r0 *sarama.Broker + var r1 error + if rf, ok := ret.Get(0).(func() (*sarama.Broker, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() *sarama.Broker); ok { r0 = rf() } else { @@ -108,7 +139,6 @@ func (_m *Client) Controller() (*sarama.Broker, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -122,7 +152,15 @@ func (_m *Client) Controller() (*sarama.Broker, error) { func (_m *Client) Coordinator(consumerGroup string) (*sarama.Broker, error) { ret := _m.Called(consumerGroup) + if len(ret) == 0 { + panic("no return value specified for Coordinator") + } + var r0 *sarama.Broker + var r1 error + if rf, ok := ret.Get(0).(func(string) (*sarama.Broker, error)); ok { + return rf(consumerGroup) + } if rf, ok := ret.Get(0).(func(string) *sarama.Broker); ok { r0 = rf(consumerGroup) } else { @@ -131,7 +169,6 @@ func (_m *Client) Coordinator(consumerGroup string) (*sarama.Broker, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(consumerGroup) } else { @@ -145,14 +182,21 @@ func (_m *Client) Coordinator(consumerGroup string) (*sarama.Broker, error) { func (_m *Client) GetOffset(topic string, partitionID int32, time int64) (int64, error) { ret := _m.Called(topic, partitionID, time) + if len(ret) == 0 { + panic("no return value specified for GetOffset") + } + var r0 int64 + var r1 error + if rf, ok := ret.Get(0).(func(string, int32, int64) (int64, error)); ok { + return rf(topic, partitionID, time) + } if rf, ok := ret.Get(0).(func(string, int32, int64) int64); ok { r0 = rf(topic, partitionID, time) } else { r0 = ret.Get(0).(int64) } - var r1 error if rf, ok := ret.Get(1).(func(string, int32, int64) error); ok { r1 = rf(topic, partitionID, time) } else { @@ -166,7 +210,15 @@ func (_m *Client) GetOffset(topic string, partitionID int32, time int64) (int64, func (_m *Client) InSyncReplicas(topic string, partitionID int32) ([]int32, error) { ret := _m.Called(topic, partitionID) + if len(ret) == 0 { + panic("no return value specified for InSyncReplicas") + } + var r0 []int32 + var r1 error + if rf, ok := ret.Get(0).(func(string, int32) ([]int32, error)); ok { + return rf(topic, partitionID) + } if rf, ok := ret.Get(0).(func(string, int32) []int32); ok { r0 = rf(topic, partitionID) } else { @@ -175,7 +227,6 @@ func (_m *Client) InSyncReplicas(topic string, partitionID int32) ([]int32, erro } } - var r1 error if rf, ok := ret.Get(1).(func(string, int32) error); ok { r1 = rf(topic, partitionID) } else { @@ -189,7 +240,15 @@ func (_m *Client) InSyncReplicas(topic string, partitionID int32) ([]int32, erro func (_m *Client) InitProducerID() (*sarama.InitProducerIDResponse, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for InitProducerID") + } + var r0 *sarama.InitProducerIDResponse + var r1 error + if rf, ok := ret.Get(0).(func() (*sarama.InitProducerIDResponse, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() *sarama.InitProducerIDResponse); ok { r0 = rf() } else { @@ -198,7 +257,6 @@ func (_m *Client) InitProducerID() (*sarama.InitProducerIDResponse, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -212,7 +270,15 @@ func (_m *Client) InitProducerID() (*sarama.InitProducerIDResponse, error) { func (_m *Client) Leader(topic string, partitionID int32) (*sarama.Broker, error) { ret := _m.Called(topic, partitionID) + if len(ret) == 0 { + panic("no return value specified for Leader") + } + var r0 *sarama.Broker + var r1 error + if rf, ok := ret.Get(0).(func(string, int32) (*sarama.Broker, error)); ok { + return rf(topic, partitionID) + } if rf, ok := ret.Get(0).(func(string, int32) *sarama.Broker); ok { r0 = rf(topic, partitionID) } else { @@ -221,7 +287,6 @@ func (_m *Client) Leader(topic string, partitionID int32) (*sarama.Broker, error } } - var r1 error if rf, ok := ret.Get(1).(func(string, int32) error); ok { r1 = rf(topic, partitionID) } else { @@ -231,10 +296,51 @@ func (_m *Client) Leader(topic string, partitionID int32) (*sarama.Broker, error return r0, r1 } +// LeaderAndEpoch provides a mock function with given fields: topic, partitionID +func (_m *Client) LeaderAndEpoch(topic string, partitionID int32) (*sarama.Broker, int32, error) { + ret := _m.Called(topic, partitionID) + + if len(ret) == 0 { + panic("no return value specified for LeaderAndEpoch") + } + + var r0 *sarama.Broker + var r1 int32 + var r2 error + if rf, ok := ret.Get(0).(func(string, int32) (*sarama.Broker, int32, error)); ok { + return rf(topic, partitionID) + } + if rf, ok := ret.Get(0).(func(string, int32) *sarama.Broker); ok { + r0 = rf(topic, partitionID) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*sarama.Broker) + } + } + + if rf, ok := ret.Get(1).(func(string, int32) int32); ok { + r1 = rf(topic, partitionID) + } else { + r1 = ret.Get(1).(int32) + } + + if rf, ok := ret.Get(2).(func(string, int32) error); ok { + r2 = rf(topic, partitionID) + } else { + r2 = ret.Error(2) + } + + return r0, r1, r2 +} + // LeastLoadedBroker provides a mock function with given fields: func (_m *Client) LeastLoadedBroker() *sarama.Broker { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for LeastLoadedBroker") + } + var r0 *sarama.Broker if rf, ok := ret.Get(0).(func() *sarama.Broker); ok { r0 = rf() @@ -251,7 +357,15 @@ func (_m *Client) LeastLoadedBroker() *sarama.Broker { func (_m *Client) OfflineReplicas(topic string, partitionID int32) ([]int32, error) { ret := _m.Called(topic, partitionID) + if len(ret) == 0 { + panic("no return value specified for OfflineReplicas") + } + var r0 []int32 + var r1 error + if rf, ok := ret.Get(0).(func(string, int32) ([]int32, error)); ok { + return rf(topic, partitionID) + } if rf, ok := ret.Get(0).(func(string, int32) []int32); ok { r0 = rf(topic, partitionID) } else { @@ -260,7 +374,6 @@ func (_m *Client) OfflineReplicas(topic string, partitionID int32) ([]int32, err } } - var r1 error if rf, ok := ret.Get(1).(func(string, int32) error); ok { r1 = rf(topic, partitionID) } else { @@ -274,7 +387,15 @@ func (_m *Client) OfflineReplicas(topic string, partitionID int32) ([]int32, err func (_m *Client) Partitions(topic string) ([]int32, error) { ret := _m.Called(topic) + if len(ret) == 0 { + panic("no return value specified for Partitions") + } + var r0 []int32 + var r1 error + if rf, ok := ret.Get(0).(func(string) ([]int32, error)); ok { + return rf(topic) + } if rf, ok := ret.Get(0).(func(string) []int32); ok { r0 = rf(topic) } else { @@ -283,7 +404,6 @@ func (_m *Client) Partitions(topic string) ([]int32, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(topic) } else { @@ -297,6 +417,10 @@ func (_m *Client) Partitions(topic string) ([]int32, error) { func (_m *Client) RefreshBrokers(addrs []string) error { ret := _m.Called(addrs) + if len(ret) == 0 { + panic("no return value specified for RefreshBrokers") + } + var r0 error if rf, ok := ret.Get(0).(func([]string) error); ok { r0 = rf(addrs) @@ -311,7 +435,15 @@ func (_m *Client) RefreshBrokers(addrs []string) error { func (_m *Client) RefreshController() (*sarama.Broker, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for RefreshController") + } + var r0 *sarama.Broker + var r1 error + if rf, ok := ret.Get(0).(func() (*sarama.Broker, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() *sarama.Broker); ok { r0 = rf() } else { @@ -320,7 +452,6 @@ func (_m *Client) RefreshController() (*sarama.Broker, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -334,6 +465,10 @@ func (_m *Client) RefreshController() (*sarama.Broker, error) { func (_m *Client) RefreshCoordinator(consumerGroup string) error { ret := _m.Called(consumerGroup) + if len(ret) == 0 { + panic("no return value specified for RefreshCoordinator") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(consumerGroup) @@ -354,6 +489,10 @@ func (_m *Client) RefreshMetadata(topics ...string) error { _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for RefreshMetadata") + } + var r0 error if rf, ok := ret.Get(0).(func(...string) error); ok { r0 = rf(topics...) @@ -368,6 +507,10 @@ func (_m *Client) RefreshMetadata(topics ...string) error { func (_m *Client) RefreshTransactionCoordinator(transactionID string) error { ret := _m.Called(transactionID) + if len(ret) == 0 { + panic("no return value specified for RefreshTransactionCoordinator") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(transactionID) @@ -382,7 +525,15 @@ func (_m *Client) RefreshTransactionCoordinator(transactionID string) error { func (_m *Client) Replicas(topic string, partitionID int32) ([]int32, error) { ret := _m.Called(topic, partitionID) + if len(ret) == 0 { + panic("no return value specified for Replicas") + } + var r0 []int32 + var r1 error + if rf, ok := ret.Get(0).(func(string, int32) ([]int32, error)); ok { + return rf(topic, partitionID) + } if rf, ok := ret.Get(0).(func(string, int32) []int32); ok { r0 = rf(topic, partitionID) } else { @@ -391,7 +542,6 @@ func (_m *Client) Replicas(topic string, partitionID int32) ([]int32, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(string, int32) error); ok { r1 = rf(topic, partitionID) } else { @@ -405,7 +555,15 @@ func (_m *Client) Replicas(topic string, partitionID int32) ([]int32, error) { func (_m *Client) Topics() ([]string, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Topics") + } + var r0 []string + var r1 error + if rf, ok := ret.Get(0).(func() ([]string, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() []string); ok { r0 = rf() } else { @@ -414,7 +572,6 @@ func (_m *Client) Topics() ([]string, error) { } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -428,7 +585,15 @@ func (_m *Client) Topics() ([]string, error) { func (_m *Client) TransactionCoordinator(transactionID string) (*sarama.Broker, error) { ret := _m.Called(transactionID) + if len(ret) == 0 { + panic("no return value specified for TransactionCoordinator") + } + var r0 *sarama.Broker + var r1 error + if rf, ok := ret.Get(0).(func(string) (*sarama.Broker, error)); ok { + return rf(transactionID) + } if rf, ok := ret.Get(0).(func(string) *sarama.Broker); ok { r0 = rf(transactionID) } else { @@ -437,7 +602,6 @@ func (_m *Client) TransactionCoordinator(transactionID string) (*sarama.Broker, } } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(transactionID) } else { @@ -451,7 +615,15 @@ func (_m *Client) TransactionCoordinator(transactionID string) (*sarama.Broker, func (_m *Client) WritablePartitions(topic string) ([]int32, error) { ret := _m.Called(topic) + if len(ret) == 0 { + panic("no return value specified for WritablePartitions") + } + var r0 []int32 + var r1 error + if rf, ok := ret.Get(0).(func(string) ([]int32, error)); ok { + return rf(topic) + } if rf, ok := ret.Get(0).(func(string) []int32); ok { r0 = rf(topic) } else { @@ -460,7 +632,6 @@ func (_m *Client) WritablePartitions(topic string) ([]int32, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { r1 = rf(topic) } else { @@ -469,3 +640,17 @@ func (_m *Client) WritablePartitions(topic string) ([]int32, error) { return r0, r1 } + +// NewClient creates a new instance of Client. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewClient(t interface { + mock.TestingT + Cleanup(func()) +}) *Client { + mock := &Client{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/mocks/saramamocks/consumer_group.go b/mocks/saramamocks/consumer_group.go index f17dac93..09c52bb9 100644 --- a/mocks/saramamocks/consumer_group.go +++ b/mocks/saramamocks/consumer_group.go @@ -1,11 +1,11 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.39.2. DO NOT EDIT. package saramamocks import ( context "context" - sarama "github.com/Shopify/sarama" + sarama "github.com/IBM/sarama" mock "github.com/stretchr/testify/mock" ) @@ -18,6 +18,10 @@ type ConsumerGroup struct { func (_m *ConsumerGroup) Close() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Close") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() @@ -32,6 +36,10 @@ func (_m *ConsumerGroup) Close() error { func (_m *ConsumerGroup) Consume(ctx context.Context, topics []string, handler sarama.ConsumerGroupHandler) error { ret := _m.Called(ctx, topics, handler) + if len(ret) == 0 { + panic("no return value specified for Consume") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, []string, sarama.ConsumerGroupHandler) error); ok { r0 = rf(ctx, topics, handler) @@ -46,6 +54,10 @@ func (_m *ConsumerGroup) Consume(ctx context.Context, topics []string, handler s func (_m *ConsumerGroup) Errors() <-chan error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Errors") + } + var r0 <-chan error if rf, ok := ret.Get(0).(func() <-chan error); ok { r0 = rf() @@ -77,3 +89,17 @@ func (_m *ConsumerGroup) Resume(partitions map[string][]int32) { func (_m *ConsumerGroup) ResumeAll() { _m.Called() } + +// NewConsumerGroup creates a new instance of ConsumerGroup. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewConsumerGroup(t interface { + mock.TestingT + Cleanup(func()) +}) *ConsumerGroup { + mock := &ConsumerGroup{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/mocks/saramamocks/consumer_group_claim.go b/mocks/saramamocks/consumer_group_claim.go index cd2a8a69..fe91f416 100644 --- a/mocks/saramamocks/consumer_group_claim.go +++ b/mocks/saramamocks/consumer_group_claim.go @@ -1,9 +1,9 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.39.2. DO NOT EDIT. package saramamocks import ( - sarama "github.com/Shopify/sarama" + sarama "github.com/IBM/sarama" mock "github.com/stretchr/testify/mock" ) @@ -16,6 +16,10 @@ type ConsumerGroupClaim struct { func (_m *ConsumerGroupClaim) HighWaterMarkOffset() int64 { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for HighWaterMarkOffset") + } + var r0 int64 if rf, ok := ret.Get(0).(func() int64); ok { r0 = rf() @@ -30,6 +34,10 @@ func (_m *ConsumerGroupClaim) HighWaterMarkOffset() int64 { func (_m *ConsumerGroupClaim) InitialOffset() int64 { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for InitialOffset") + } + var r0 int64 if rf, ok := ret.Get(0).(func() int64); ok { r0 = rf() @@ -44,6 +52,10 @@ func (_m *ConsumerGroupClaim) InitialOffset() int64 { func (_m *ConsumerGroupClaim) Messages() <-chan *sarama.ConsumerMessage { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Messages") + } + var r0 <-chan *sarama.ConsumerMessage if rf, ok := ret.Get(0).(func() <-chan *sarama.ConsumerMessage); ok { r0 = rf() @@ -60,6 +72,10 @@ func (_m *ConsumerGroupClaim) Messages() <-chan *sarama.ConsumerMessage { func (_m *ConsumerGroupClaim) Partition() int32 { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Partition") + } + var r0 int32 if rf, ok := ret.Get(0).(func() int32); ok { r0 = rf() @@ -74,6 +90,10 @@ func (_m *ConsumerGroupClaim) Partition() int32 { func (_m *ConsumerGroupClaim) Topic() string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Topic") + } + var r0 string if rf, ok := ret.Get(0).(func() string); ok { r0 = rf() @@ -83,3 +103,17 @@ func (_m *ConsumerGroupClaim) Topic() string { return r0 } + +// NewConsumerGroupClaim creates a new instance of ConsumerGroupClaim. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewConsumerGroupClaim(t interface { + mock.TestingT + Cleanup(func()) +}) *ConsumerGroupClaim { + mock := &ConsumerGroupClaim{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/mocks/saramamocks/consumer_group_session.go b/mocks/saramamocks/consumer_group_session.go index 5ed06184..bda97dce 100644 --- a/mocks/saramamocks/consumer_group_session.go +++ b/mocks/saramamocks/consumer_group_session.go @@ -1,11 +1,11 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.39.2. DO NOT EDIT. package saramamocks import ( context "context" - sarama "github.com/Shopify/sarama" + sarama "github.com/IBM/sarama" mock "github.com/stretchr/testify/mock" ) @@ -18,6 +18,10 @@ type ConsumerGroupSession struct { func (_m *ConsumerGroupSession) Claims() map[string][]int32 { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Claims") + } + var r0 map[string][]int32 if rf, ok := ret.Get(0).(func() map[string][]int32); ok { r0 = rf() @@ -39,6 +43,10 @@ func (_m *ConsumerGroupSession) Commit() { func (_m *ConsumerGroupSession) Context() context.Context { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Context") + } + var r0 context.Context if rf, ok := ret.Get(0).(func() context.Context); ok { r0 = rf() @@ -55,6 +63,10 @@ func (_m *ConsumerGroupSession) Context() context.Context { func (_m *ConsumerGroupSession) GenerationID() int32 { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GenerationID") + } + var r0 int32 if rf, ok := ret.Get(0).(func() int32); ok { r0 = rf() @@ -79,6 +91,10 @@ func (_m *ConsumerGroupSession) MarkOffset(topic string, partition int32, offset func (_m *ConsumerGroupSession) MemberID() string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for MemberID") + } + var r0 string if rf, ok := ret.Get(0).(func() string); ok { r0 = rf() @@ -93,3 +109,17 @@ func (_m *ConsumerGroupSession) MemberID() string { func (_m *ConsumerGroupSession) ResetOffset(topic string, partition int32, offset int64, metadata string) { _m.Called(topic, partition, offset, metadata) } + +// NewConsumerGroupSession creates a new instance of ConsumerGroupSession. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewConsumerGroupSession(t interface { + mock.TestingT + Cleanup(func()) +}) *ConsumerGroupSession { + mock := &ConsumerGroupSession{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +}