diff --git a/go.mod b/go.mod index b6418b16..20470fee 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/DecentralCardGame/Cardchain go 1.20 require ( + cosmossdk.io/errors v1.0.0-beta.7 github.com/DecentralCardGame/cardobject v0.5.0 github.com/cosmos/cosmos-sdk v0.46.15 github.com/cosmos/ibc-go/v6 v6.1.0 @@ -29,7 +30,6 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.0 // indirect cloud.google.com/go/storage v1.30.1 // indirect - cosmossdk.io/errors v1.0.0-beta.7 // indirect cosmossdk.io/math v1.0.0-rc.0 // indirect filippo.io/edwards25519 v1.0.0-rc.1 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect diff --git a/scripts/requester/go.mod b/scripts/requester/go.mod index 747a23fb..9bc71021 100644 --- a/scripts/requester/go.mod +++ b/scripts/requester/go.mod @@ -11,17 +11,17 @@ replace github.com/tendermint/tendermint => github.com/informalsystems/tendermin require ( github.com/DecentralCardGame/Cardchain v0.0.0-00010101000000-000000000000 github.com/DecentralCardGame/cardobject v0.5.0 - github.com/cosmos/cosmos-sdk v0.46.12 + github.com/cosmos/cosmos-sdk v0.46.15 github.com/ignite/cli v0.26.1 ) require ( cosmossdk.io/errors v1.0.0-beta.7 // indirect - cosmossdk.io/math v1.0.0-beta.4 // indirect + cosmossdk.io/math v1.0.0-rc.0 // indirect filippo.io/edwards25519 v1.0.0-rc.1 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect - github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect + github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect @@ -35,12 +35,12 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-alpha8 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.5 // indirect + github.com/cosmos/iavl v0.19.6 // indirect github.com/cosmos/ibc-go/v6 v6.1.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect @@ -73,23 +73,23 @@ require ( github.com/iancoleman/orderedmap v0.2.0 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/klauspost/compress v1.15.11 // indirect + github.com/klauspost/compress v1.16.0 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/magiconair/properties v1.8.6 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect - github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect + github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.9.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.2 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect @@ -99,18 +99,18 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.14.0 // indirect - github.com/stretchr/testify v1.8.1 // indirect + github.com/stretchr/testify v1.8.2 // indirect github.com/subosito/gotenv v1.4.1 // indirect - github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect - github.com/tendermint/tendermint v0.34.27 // indirect + github.com/tendermint/tendermint v0.34.29 // indirect github.com/tendermint/tm-db v0.6.7 // indirect github.com/tidwall/btree v1.5.0 // indirect github.com/zondax/hid v0.9.1 // indirect github.com/zondax/ledger-go v0.14.1 // indirect go.etcd.io/bbolt v1.3.6 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20221212164502-fae10dda9338 // indirect + golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect golang.org/x/mod v0.8.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.2.0 // indirect diff --git a/scripts/requester/go.sum b/scripts/requester/go.sum index 1624412e..a3cee410 100644 --- a/scripts/requester/go.sum +++ b/scripts/requester/go.sum @@ -504,6 +504,7 @@ cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= cosmossdk.io/math v1.0.0-beta.4 h1:JtKedVLGzA0vv84xjYmZ75RKG35Kf2WwcFu8IjRkIIw= cosmossdk.io/math v1.0.0-beta.4/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM= +cosmossdk.io/math v1.0.0-rc.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= @@ -529,6 +530,7 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOC github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= +github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= @@ -575,6 +577,7 @@ github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 h1:rFw4nCn9iMW+Vaj github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alecthomas/chroma v0.8.2 h1:x3zkuE2lUk/RIekyAJ3XRqSCP4zwWDfcw/YJCuCAACg= github.com/alecthomas/chroma v0.8.2/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM= +github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= 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= @@ -582,6 +585,7 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw= @@ -755,6 +759,7 @@ github.com/cosmos/cosmos-sdk v0.46.10/go.mod h1:ZFL/yjcIZq67H8FiWoLCnnaChkXnbRRY github.com/cosmos/cosmos-sdk v0.46.11/go.mod h1:bG4AkW9bqc8ycrryyKGQEl3YV9BY2wr6HggGq8kvcgM= github.com/cosmos/cosmos-sdk v0.46.12 h1:M3LAKjCDqseJUkSIAJD/PUGeMsRq1Jf0GX+MocHVjrM= github.com/cosmos/cosmos-sdk v0.46.12/go.mod h1:bG4AkW9bqc8ycrryyKGQEl3YV9BY2wr6HggGq8kvcgM= +github.com/cosmos/cosmos-sdk v0.46.15/go.mod h1:9MRixWsgoJ2UmVsCRRePtENFPP3cM+gTC5azEpxgllo= github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1 h1:6YvzjQtc+cDwCe9XwYPPa8zFCxNG79N7vmCjpK+vGOg= github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1/go.mod h1:JUMM2MxF9wuwzRWZJjb8BjXsn1BmPmdBd3a75pIct4I= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= @@ -764,6 +769,7 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= github.com/cosmos/iavl v0.19.5/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/iavl v0.19.6/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-go/v6 v6.1.0 h1:o7oXws2vKkKfOFzJI+oNylRn44PCNt5wzHd/zKQKbvQ= github.com/cosmos/ibc-go/v6 v6.1.0/go.mod h1:CY3zh2HLfetRiW8LY6kVHMATe90Wj/UOoY8T6cuB0is= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= @@ -789,6 +795,7 @@ github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU= github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= github.com/derekparker/trie v0.0.0-20200317170641-1fdf38b7b0e9 h1:G765iDCq7bP5opdrPkXk+4V3yfkgV9iGFuheWZ/X/zY= @@ -872,6 +879,7 @@ github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3 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.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= @@ -920,6 +928,7 @@ github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7a github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= github.com/go-toolsmith/astcopy v1.0.2 h1:YnWf5Rnh1hUudj11kei53kI57quN/VH6Hp1n+erozn0= @@ -1078,6 +1087,7 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2 h1:LR89qFljJ48s990kEKGsk213yIJDPI4205OKOzbURK8= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= @@ -1213,6 +1223,7 @@ github.com/jgautheron/goconst v1.5.1 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+ github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98= github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs= github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= @@ -1259,6 +1270,7 @@ github.com/kkHAIKE/contextcheck v1.1.3/go.mod h1:PG/cwd6c0705/LM0KTr1acO2gORUxkS github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1312,6 +1324,7 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec 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-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= @@ -1319,6 +1332,7 @@ github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= 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/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwgOdMUQePUo= github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/meowgorithm/babyenv v1.3.1 h1:18ZEYIgbzoFQfRLF9+lxjRfk/ui6w8U0FWl07CgWvvc= @@ -1342,6 +1356,7 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -1407,6 +1422,7 @@ github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -1415,9 +1431,15 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -1442,10 +1464,12 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/performancecopilot/speed/v4 v4.0.0 h1:VxEDCmdkfbQYDlcr/GC9YoN9PQ6p8ulk9xVsepYy9ZY= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/pjbgf/sha1cd v0.2.3 h1:uKQP/7QOzNtKYH7UTohZLcjF5/55EnTw0jO/Ru4jZwI= @@ -1485,6 +1509,7 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= @@ -1493,6 +1518,7 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/quasilyte/go-ruleguard v0.3.18 h1:sd+abO1PEI9fkYennwzHn9kl3nqP6M5vE7FiOzZ+5CE= github.com/quasilyte/go-ruleguard v0.3.18/go.mod h1:lOIzcYlgxrQ2sGJ735EHXmf/e9MJ516j16K/Ifcttvs= github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f h1:6Gtn2i04RD0gVyYf2/IUMTIs+qYleBt4zxDqkLTcu4U= @@ -1518,10 +1544,12 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= +github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -1620,13 +1648,16 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 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.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= 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/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= 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/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tbruyelle/mdgofmt v0.1.3 h1:ZQo2nbYhK7CG0kApQmgUeMBFugIgIO9tHvyChaMzf30= github.com/tbruyelle/mdgofmt v0.1.3/go.mod h1:D3fyKvx4oZq99YeQm5j/gnGmc9w4HogvQMujPVzW+zQ= github.com/tdakkota/asciicheck v0.1.1 h1:PKzG7JUTUmVspQTDqtkX9eSiLGossXTybutHwTXuO0A= @@ -1673,6 +1704,7 @@ github.com/vektra/mockery/v2 v2.16.0 h1:NMfQMZ4dKAHxR0rTHCt47HyJlBgFdYmrLlHhZIj2 github.com/vektra/mockery/v2 v2.16.0/go.mod h1:OZL0JSpvEWEHgyNr150zNbP1ktxr6yPZ/W82RHaTHl0= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= +github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow= @@ -1761,6 +1793,7 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20221212164502-fae10dda9338 h1:OvjRkcNHnf6/W5FZXSxODbxwD+X7fspczG7Jn/xQVD4= golang.org/x/exp v0.0.0-20221212164502-fae10dda9338/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 h1:Ic/qN6TEifvObMGQy72k0n1LlJr7DjWWEi+MOsDOiSk= golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= @@ -1829,9 +1862,11 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= @@ -1913,6 +1948,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1923,11 +1959,14 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/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-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= golang.org/x/sys v0.4.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.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= @@ -2006,6 +2045,7 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -2018,6 +2058,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/gonum v0.8.2 h1:CCXrcPKiGGotvnN6jfUsKk4rRqm7q09/YbKb5xCEvtM= diff --git a/x/cardchain/handler.go b/x/cardchain/handler.go index 1fd3c9f4..aac0da42 100644 --- a/x/cardchain/handler.go +++ b/x/cardchain/handler.go @@ -3,10 +3,11 @@ package cardchain import ( "fmt" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/keeper" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) // NewHandler ... @@ -134,7 +135,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler { // this line is used by starport scaffolding # 1 default: errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg) - return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) + return nil, sdkerrors.Wrap(errors.ErrUnknownRequest, errMsg) } } } diff --git a/x/cardchain/keeper/coin.go b/x/cardchain/keeper/coin.go index 6dd3b5a5..ef566399 100644 --- a/x/cardchain/keeper/coin.go +++ b/x/cardchain/keeper/coin.go @@ -1,9 +1,9 @@ package keeper import ( + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "math/big" ) diff --git a/x/cardchain/keeper/collection.go b/x/cardchain/keeper/collection.go index 33e3c9de..51b404d5 100644 --- a/x/cardchain/keeper/collection.go +++ b/x/cardchain/keeper/collection.go @@ -3,11 +3,11 @@ package keeper import ( "errors" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" "github.com/DecentralCardGame/cardobject/cardobject" "github.com/DecentralCardGame/cardobject/keywords" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) // CollectCollectionFee Collects a fee from a user diff --git a/x/cardchain/keeper/grpc_query_q_card.go b/x/cardchain/keeper/grpc_query_q_card.go index cd13afae..ee100da7 100644 --- a/x/cardchain/keeper/grpc_query_q_card.go +++ b/x/cardchain/keeper/grpc_query_q_card.go @@ -7,8 +7,10 @@ import ( "strconv" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" + + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -23,12 +25,12 @@ func (k Keeper) QCard(goCtx context.Context, req *types.QueryQCardRequest) (*typ // Start of query code cardId, err := strconv.ParseUint(req.CardId, 10, 64) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "could not parse cardId") + return nil, sdkerrors.Wrap(errors.ErrUnknownRequest, "could not parse cardId") } card := k.Cards.Get(ctx, cardId) if card == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "cardId does not represent a card") + return nil, sdkerrors.Wrap(errors.ErrUnknownRequest, "cardId does not represent a card") } image := k.Images.Get(ctx, card.ImageId) diff --git a/x/cardchain/keeper/grpc_query_q_card_content.go b/x/cardchain/keeper/grpc_query_q_card_content.go index b732d87a..e5085627 100644 --- a/x/cardchain/keeper/grpc_query_q_card_content.go +++ b/x/cardchain/keeper/grpc_query_q_card_content.go @@ -5,11 +5,12 @@ import ( "crypto/md5" "encoding/hex" "fmt" + "github.com/cosmos/cosmos-sdk/types/errors" "strconv" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -23,12 +24,12 @@ func (k Keeper) QCardContent(goCtx context.Context, req *types.QueryQCardContent cardId, err := strconv.ParseUint(req.CardId, 10, 64) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "could not parse cardId") + return nil, sdkerrors.Wrap(errors.ErrUnknownRequest, "could not parse cardId") } card := k.Cards.Get(ctx, cardId) if &card == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "cardId does not represent a card") + return nil, sdkerrors.Wrap(errors.ErrUnknownRequest, "cardId does not represent a card") } image := k.Images.Get(ctx, card.ImageId) diff --git a/x/cardchain/keeper/grpc_query_q_cards.go b/x/cardchain/keeper/grpc_query_q_cards.go index f72afb6e..ba03dea5 100644 --- a/x/cardchain/keeper/grpc_query_q_cards.go +++ b/x/cardchain/keeper/grpc_query_q_cards.go @@ -7,11 +7,12 @@ import ( "strconv" "strings" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" "github.com/DecentralCardGame/cardobject/cardobject" "github.com/DecentralCardGame/cardobject/keywords" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -135,7 +136,7 @@ func (k Keeper) QCards(goCtx context.Context, req *types.QueryQCardsRequest) (*t if req.NameContains != "" || req.CardType != "" || req.SortBy != "" || req.Classes != "" || req.KeywordsContains != "" { cardobj, err := keywords.Unmarshal(gottenCard.Content) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()+"cardid="+strconv.FormatUint(idx, 10)) + return nil, sdkerrors.Wrap(errors.ErrJSONMarshal, err.Error()+"cardid="+strconv.FormatUint(idx, 10)) } if cardobj.Action != nil { diff --git a/x/cardchain/keeper/grpc_query_q_sell_offers.go b/x/cardchain/keeper/grpc_query_q_sell_offers.go index 66385b40..78b35a5d 100644 --- a/x/cardchain/keeper/grpc_query_q_sell_offers.go +++ b/x/cardchain/keeper/grpc_query_q_sell_offers.go @@ -3,9 +3,9 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/cardchain/keeper/grpc_query_q_user.go b/x/cardchain/keeper/grpc_query_q_user.go index 0f65c1e7..d4d12311 100644 --- a/x/cardchain/keeper/grpc_query_q_user.go +++ b/x/cardchain/keeper/grpc_query_q_user.go @@ -3,9 +3,9 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/cardchain/keeper/grpc_query_q_votable_cards.go b/x/cardchain/keeper/grpc_query_q_votable_cards.go index 59d06a3a..39ee0e46 100644 --- a/x/cardchain/keeper/grpc_query_q_votable_cards.go +++ b/x/cardchain/keeper/grpc_query_q_votable_cards.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -19,7 +20,7 @@ func (k Keeper) QVotableCards(goCtx context.Context, req *types.QueryQVotableCar address, err := sdk.AccAddressFromBech32(req.Address) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "could not parse user address") + return nil, sdkerrors.Wrap(errors.ErrUnknownRequest, "could not parse user address") } unreg := true diff --git a/x/cardchain/keeper/keeper.go b/x/cardchain/keeper/keeper.go index 0c444457..c625f2b7 100644 --- a/x/cardchain/keeper/keeper.go +++ b/x/cardchain/keeper/keeper.go @@ -3,6 +3,7 @@ package keeper import ( "encoding/json" "fmt" + "github.com/cosmos/cosmos-sdk/types/errors" "sort" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" @@ -12,7 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/tendermint/tendermint/libs/log" ) @@ -89,7 +89,7 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { func (k Keeper) TransferSchemeToCard(ctx sdk.Context, cardId uint64, user *User) (err error) { user.OwnedCardSchemes, err = PopItemFromArr(cardId, user.OwnedCardSchemes) if err != nil { - return sdkerrors.ErrUnauthorized + return errors.ErrUnauthorized } user.OwnedPrototypes = append(user.OwnedPrototypes, cardId) diff --git a/x/cardchain/keeper/match.go b/x/cardchain/keeper/match.go index 336c115d..29d0f19f 100644 --- a/x/cardchain/keeper/match.go +++ b/x/cardchain/keeper/match.go @@ -4,9 +4,10 @@ import ( "fmt" "time" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) @@ -92,7 +93,7 @@ func (k Keeper) distributeCoins(ctx sdk.Context, match *types.Match, outcome typ if !amounts[idx].IsZero() { err := k.MintCoinsToAddr(ctx, address, sdk.Coins{amounts[idx]}) if err != nil { - return sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } k.SubPoolCredits(ctx, WinnersPoolKey, amounts[idx]) diff --git a/x/cardchain/keeper/msg_server_add_artwork.go b/x/cardchain/keeper/msg_server_add_artwork.go index 3a3abb5d..85b173c1 100644 --- a/x/cardchain/keeper/msg_server_add_artwork.go +++ b/x/cardchain/keeper/msg_server_add_artwork.go @@ -3,10 +3,11 @@ package keeper import ( "context" "fmt" + "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) AddArtwork(goCtx context.Context, msg *types.MsgAddArtwork) (*types.MsgAddArtworkResponse, error) { @@ -21,7 +22,7 @@ func (k msgServer) AddArtwork(goCtx context.Context, msg *types.MsgAddArtwork) ( //} if card.Artist != msg.Creator { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect Artist") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Incorrect Artist") } if len(msg.Image) > 500000 { diff --git a/x/cardchain/keeper/msg_server_add_artwork_to_collection.go b/x/cardchain/keeper/msg_server_add_artwork_to_collection.go index 26a3225d..9cc60d90 100644 --- a/x/cardchain/keeper/msg_server_add_artwork_to_collection.go +++ b/x/cardchain/keeper/msg_server_add_artwork_to_collection.go @@ -4,9 +4,10 @@ import ( "context" "fmt" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) AddArtworkToCollection(goCtx context.Context, msg *types.MsgAddArtworkToCollection) (*types.MsgAddArtworkToCollectionResponse, error) { @@ -16,7 +17,7 @@ func (k msgServer) AddArtworkToCollection(goCtx context.Context, msg *types.MsgA image := k.Images.Get(ctx, collection.ArtworkId) if collection.Artist != msg.Creator { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect Artist") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Incorrect Artist") } if collection.Status != types.CStatus_design { return nil, types.ErrCollectionNotInDesign @@ -28,7 +29,7 @@ func (k msgServer) AddArtworkToCollection(goCtx context.Context, msg *types.MsgA err := k.CollectCollectionConributionFee(ctx, msg.Creator) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } image.Image = msg.Image diff --git a/x/cardchain/keeper/msg_server_add_card_to_collection.go b/x/cardchain/keeper/msg_server_add_card_to_collection.go index 7b3e9d1a..b182c626 100644 --- a/x/cardchain/keeper/msg_server_add_card_to_collection.go +++ b/x/cardchain/keeper/msg_server_add_card_to_collection.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) @@ -16,7 +17,7 @@ func (k msgServer) AddCardToCollection(goCtx context.Context, msg *types.MsgAddC collection := k.Collections.Get(ctx, msg.CollectionId) if !slices.Contains(collection.Contributors, msg.Creator) { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid contributor") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid contributor") } if collection.Status != types.CStatus_design { return nil, types.ErrCollectionNotInDesign @@ -36,7 +37,7 @@ func (k msgServer) AddCardToCollection(goCtx context.Context, msg *types.MsgAddC } if card.Owner != msg.Creator { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid creator") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid creator") } if len(collection.Cards) >= collectionSize { @@ -49,7 +50,7 @@ func (k msgServer) AddCardToCollection(goCtx context.Context, msg *types.MsgAddC err := k.CollectCollectionConributionFee(ctx, msg.Creator) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } collection.Cards = append(collection.Cards, msg.CardId) diff --git a/x/cardchain/keeper/msg_server_add_contributor_to_collection.go b/x/cardchain/keeper/msg_server_add_contributor_to_collection.go index c74f1c32..2d881398 100644 --- a/x/cardchain/keeper/msg_server_add_contributor_to_collection.go +++ b/x/cardchain/keeper/msg_server_add_contributor_to_collection.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) @@ -14,7 +15,7 @@ func (k msgServer) AddContributorToCollection(goCtx context.Context, msg *types. collection := k.Collections.Get(ctx, msg.CollectionId) if msg.Creator != collection.Contributors[0] { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid creator") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid creator") } if collection.Status != types.CStatus_design { return nil, types.ErrCollectionNotInDesign @@ -26,7 +27,7 @@ func (k msgServer) AddContributorToCollection(goCtx context.Context, msg *types. err := k.CollectCollectionConributionFee(ctx, msg.Creator) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } collection.Contributors = append(collection.Contributors, msg.User) diff --git a/x/cardchain/keeper/msg_server_add_story_to_collection.go b/x/cardchain/keeper/msg_server_add_story_to_collection.go index be327078..ac3c9de3 100644 --- a/x/cardchain/keeper/msg_server_add_story_to_collection.go +++ b/x/cardchain/keeper/msg_server_add_story_to_collection.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) AddStoryToCollection(goCtx context.Context, msg *types.MsgAddStoryToCollection) (*types.MsgAddStoryToCollectionResponse, error) { @@ -13,7 +14,7 @@ func (k msgServer) AddStoryToCollection(goCtx context.Context, msg *types.MsgAdd collection := k.Collections.Get(ctx, msg.CollectionId) if collection.StoryWriter != msg.Creator { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect StoryWriter") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Incorrect StoryWriter") } if collection.Status != types.CStatus_design { return nil, types.ErrCollectionNotInDesign @@ -21,7 +22,7 @@ func (k msgServer) AddStoryToCollection(goCtx context.Context, msg *types.MsgAdd err := k.CollectCollectionConributionFee(ctx, msg.Creator) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } collection.Story = msg.Story diff --git a/x/cardchain/keeper/msg_server_buy_card.go b/x/cardchain/keeper/msg_server_buy_card.go index 7b745ed1..9f324b26 100644 --- a/x/cardchain/keeper/msg_server_buy_card.go +++ b/x/cardchain/keeper/msg_server_buy_card.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) BuyCard(goCtx context.Context, msg *types.MsgBuyCard) (*types.MsgBuyCardResponse, error) { @@ -29,7 +30,7 @@ func (k msgServer) BuyCard(goCtx context.Context, msg *types.MsgBuyCard) (*types err = k.BankKeeper.SendCoins(ctx, buyer.Addr, sellerAddr, sdk.Coins{sellOffer.Price}) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } buyer.Cards = append(buyer.Cards, sellOffer.Card) diff --git a/x/cardchain/keeper/msg_server_buy_card_scheme.go b/x/cardchain/keeper/msg_server_buy_card_scheme.go index 8e316e4a..a5527f17 100644 --- a/x/cardchain/keeper/msg_server_buy_card_scheme.go +++ b/x/cardchain/keeper/msg_server_buy_card_scheme.go @@ -4,9 +4,10 @@ import ( "context" "math" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) BuyCardScheme(goCtx context.Context, msg *types.MsgBuyCardScheme) (*types.MsgBuyCardSchemeResponse, error) { @@ -22,12 +23,12 @@ func (k msgServer) BuyCardScheme(goCtx context.Context, msg *types.MsgBuyCardSch } if bid.IsLT(price) { // Checks if the bid is less than price - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, "Bid not high enough") + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, "Bid not high enough") } err = k.BurnCoinsFromAddr(ctx, buyer, sdk.Coins{price}) // If so, deduct the Bid amount from the sender if err != nil { - return nil, sdkerrors.Wrapf(sdkerrors.ErrInsufficientFunds, "Buyer does not have enough coins %s", err) + return nil, sdkerrors.Wrapf(errors.ErrInsufficientFunds, "Buyer does not have enough coins %s", err) } k.AddPoolCredits(ctx, PublicPoolKey, price) diff --git a/x/cardchain/keeper/msg_server_buy_collection.go b/x/cardchain/keeper/msg_server_buy_collection.go index ccefe71d..24e1b4b8 100644 --- a/x/cardchain/keeper/msg_server_buy_collection.go +++ b/x/cardchain/keeper/msg_server_buy_collection.go @@ -5,9 +5,10 @@ import ( "fmt" "strconv" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) BuyCollection(goCtx context.Context, msg *types.MsgBuyCollection) (*types.MsgBuyCollectionResponse, error) { @@ -41,7 +42,7 @@ func (k msgServer) BuyCollection(goCtx context.Context, msg *types.MsgBuyCollect err = k.BankKeeper.SendCoins(ctx, creator.Addr, contribAddr, sdk.Coins{QuoCoin(params.CollectionPrice, int64(len(contribs)))}) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } } diff --git a/x/cardchain/keeper/msg_server_change_artist.go b/x/cardchain/keeper/msg_server_change_artist.go index 32f04bb3..d4868f06 100644 --- a/x/cardchain/keeper/msg_server_change_artist.go +++ b/x/cardchain/keeper/msg_server_change_artist.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) ChangeArtist(goCtx context.Context, msg *types.MsgChangeArtist) (*types.MsgChangeArtistResponse, error) { @@ -18,7 +19,7 @@ func (k msgServer) ChangeArtist(goCtx context.Context, msg *types.MsgChangeArtis } if card.Owner != msg.Creator { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect Owner") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Incorrect Owner") } newArtist, err := sdk.AccAddressFromBech32(msg.Artist) diff --git a/x/cardchain/keeper/msg_server_commit_council_response.go b/x/cardchain/keeper/msg_server_commit_council_response.go index 41903d86..675ba5ad 100644 --- a/x/cardchain/keeper/msg_server_commit_council_response.go +++ b/x/cardchain/keeper/msg_server_commit_council_response.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) @@ -21,7 +22,7 @@ func (k msgServer) CommitCouncilResponse(goCtx context.Context, msg *types.MsgCo council := k.Councils.Get(ctx, msg.CouncilId) if !slices.Contains(council.Voters, msg.Creator) { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid Voter") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid Voter") } if council.Status != types.CouncelingStatus_councilCreated { @@ -34,7 +35,7 @@ func (k msgServer) CommitCouncilResponse(goCtx context.Context, msg *types.MsgCo } if slices.Contains(allreadyVoted, msg.Creator) { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Allready voted") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Allready voted") } resp := types.WrapHashResponse{ @@ -57,7 +58,7 @@ func (k msgServer) CommitCouncilResponse(goCtx context.Context, msg *types.MsgCo err = k.BurnCoinsFromAddr(ctx, creator.Addr, sdk.Coins{collateralDeposit}) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, "Voter does not have enough coins") + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, "Voter does not have enough coins") } council.Treasury = council.Treasury.Add(collateralDeposit) diff --git a/x/cardchain/keeper/msg_server_confirm_match.go b/x/cardchain/keeper/msg_server_confirm_match.go index 7988377b..cc1ee773 100644 --- a/x/cardchain/keeper/msg_server_confirm_match.go +++ b/x/cardchain/keeper/msg_server_confirm_match.go @@ -4,9 +4,10 @@ import ( "context" "time" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) ConfirmMatch(goCtx context.Context, msg *types.MsgConfirmMatch) (*types.MsgConfirmMatchResponse, error) { @@ -24,14 +25,14 @@ func (k msgServer) ConfirmMatch(goCtx context.Context, msg *types.MsgConfirmMatc case match.PlayerB.Addr: player = match.PlayerB default: - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Didn't participate in match") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Didn't participate in match") } if player.Confirmed { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Already reported") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Already reported") } if match.Outcome == types.Outcome_Aborted { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Can't report, because match was aborted") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Can't report, because match was aborted") } player.Outcome = msg.Outcome diff --git a/x/cardchain/keeper/msg_server_create_collection.go b/x/cardchain/keeper/msg_server_create_collection.go index e13344d7..048ea0c2 100644 --- a/x/cardchain/keeper/msg_server_create_collection.go +++ b/x/cardchain/keeper/msg_server_create_collection.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) CreateCollection(goCtx context.Context, msg *types.MsgCreateCollection) (*types.MsgCreateCollectionResponse, error) { @@ -14,7 +15,7 @@ func (k msgServer) CreateCollection(goCtx context.Context, msg *types.MsgCreateC err := k.CollectCollectionCreationFee(ctx, msg.Creator) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } collection := types.Collection{ diff --git a/x/cardchain/keeper/msg_server_create_council.go b/x/cardchain/keeper/msg_server_create_council.go index 625e8e83..ec4082ca 100644 --- a/x/cardchain/keeper/msg_server_create_council.go +++ b/x/cardchain/keeper/msg_server_create_council.go @@ -4,9 +4,10 @@ import ( "context" "math/rand" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) CreateCouncil(goCtx context.Context, msg *types.MsgCreateCouncil) (*types.MsgCreateCouncilResponse, error) { @@ -22,7 +23,7 @@ func (k msgServer) CreateCouncil(goCtx context.Context, msg *types.MsgCreateCoun // return nil, sdkerrors.Wrapf(types.ErrInvalidCardStatus, "%s", card.Status.String()) //} else if card.Owner != msg.Creator { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect Creator") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Incorrect Creator") } var possibleVoters []User @@ -54,7 +55,7 @@ func (k msgServer) CreateCouncil(goCtx context.Context, msg *types.MsgCreateCoun err = k.BurnCoinsFromAddr(ctx, creator.Addr, sdk.Coins{treasury}) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, "Creator does not have enough coins") + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, "Creator does not have enough coins") } for _, user := range fiveVoters { diff --git a/x/cardchain/keeper/msg_server_create_sell_offer.go b/x/cardchain/keeper/msg_server_create_sell_offer.go index b266ec64..66f44d5b 100644 --- a/x/cardchain/keeper/msg_server_create_sell_offer.go +++ b/x/cardchain/keeper/msg_server_create_sell_offer.go @@ -3,9 +3,9 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) CreateSellOffer(goCtx context.Context, msg *types.MsgCreateSellOffer) (*types.MsgCreateSellOfferResponse, error) { diff --git a/x/cardchain/keeper/msg_server_donate_to_card.go b/x/cardchain/keeper/msg_server_donate_to_card.go index d93031f4..6009b017 100644 --- a/x/cardchain/keeper/msg_server_donate_to_card.go +++ b/x/cardchain/keeper/msg_server_donate_to_card.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) DonateToCard(goCtx context.Context, msg *types.MsgDonateToCard) (*types.MsgDonateToCardResponse, error) { @@ -13,7 +14,7 @@ func (k msgServer) DonateToCard(goCtx context.Context, msg *types.MsgDonateToCar err := k.BurnCoinsFromString(ctx, msg.Creator, sdk.Coins{msg.Amount}) // If so, deduct the Bid amount from the sender if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, "Donator does not have enough coins") + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, "Donator does not have enough coins") } card := k.Cards.Get(ctx, msg.CardId) diff --git a/x/cardchain/keeper/msg_server_finalize_collection.go b/x/cardchain/keeper/msg_server_finalize_collection.go index 92d8707a..4908621f 100644 --- a/x/cardchain/keeper/msg_server_finalize_collection.go +++ b/x/cardchain/keeper/msg_server_finalize_collection.go @@ -4,9 +4,10 @@ import ( "context" "fmt" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) FinalizeCollection(goCtx context.Context, msg *types.MsgFinalizeCollection) (*types.MsgFinalizeCollectionResponse, error) { @@ -16,7 +17,7 @@ func (k msgServer) FinalizeCollection(goCtx context.Context, msg *types.MsgFinal collection := k.Collections.Get(ctx, msg.CollectionId) if msg.Creator != collection.Contributors[0] { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid creator") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid creator") } if collection.Status != types.CStatus_design { @@ -29,7 +30,7 @@ func (k msgServer) FinalizeCollection(goCtx context.Context, msg *types.MsgFinal err := k.CollectCollectionCreationFee(ctx, msg.Creator) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } dist, err := k.GetRarityDistribution(ctx, *collection, uint64(collectionSize)) diff --git a/x/cardchain/keeper/msg_server_multi_vote_card.go b/x/cardchain/keeper/msg_server_multi_vote_card.go index 788643c4..fdc37122 100644 --- a/x/cardchain/keeper/msg_server_multi_vote_card.go +++ b/x/cardchain/keeper/msg_server_multi_vote_card.go @@ -3,8 +3,7 @@ package keeper import ( "context" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/cardchain/keeper/msg_server_open_booster_pack.go b/x/cardchain/keeper/msg_server_open_booster_pack.go index 732e5636..7d7d6671 100644 --- a/x/cardchain/keeper/msg_server_open_booster_pack.go +++ b/x/cardchain/keeper/msg_server_open_booster_pack.go @@ -6,11 +6,11 @@ import ( "golang.org/x/exp/slices" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" "github.com/DecentralCardGame/cardobject/cardobject" "github.com/DecentralCardGame/cardobject/keywords" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) OpenBoosterPack(goCtx context.Context, msg *types.MsgOpenBoosterPack) (*types.MsgOpenBoosterPackResponse, error) { diff --git a/x/cardchain/keeper/msg_server_register_for_council.go b/x/cardchain/keeper/msg_server_register_for_council.go index 78f14969..1e476e36 100644 --- a/x/cardchain/keeper/msg_server_register_for_council.go +++ b/x/cardchain/keeper/msg_server_register_for_council.go @@ -3,9 +3,9 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) RegisterForCouncil(goCtx context.Context, msg *types.MsgRegisterForCouncil) (*types.MsgRegisterForCouncilResponse, error) { diff --git a/x/cardchain/keeper/msg_server_remove_card_from_collection.go b/x/cardchain/keeper/msg_server_remove_card_from_collection.go index 7b6105ad..1163e84b 100644 --- a/x/cardchain/keeper/msg_server_remove_card_from_collection.go +++ b/x/cardchain/keeper/msg_server_remove_card_from_collection.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) @@ -14,7 +15,7 @@ func (k msgServer) RemoveCardFromCollection(goCtx context.Context, msg *types.Ms collection := k.Collections.Get(ctx, msg.CollectionId) if !slices.Contains(collection.Contributors, msg.Creator) { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid contributor") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid contributor") } if collection.Status != types.CStatus_design { return nil, types.ErrCollectionNotInDesign diff --git a/x/cardchain/keeper/msg_server_remove_contributor_from_collection.go b/x/cardchain/keeper/msg_server_remove_contributor_from_collection.go index 17408ed1..b47bac31 100644 --- a/x/cardchain/keeper/msg_server_remove_contributor_from_collection.go +++ b/x/cardchain/keeper/msg_server_remove_contributor_from_collection.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) RemoveContributorFromCollection(goCtx context.Context, msg *types.MsgRemoveContributorFromCollection) (*types.MsgRemoveContributorFromCollectionResponse, error) { @@ -13,7 +14,7 @@ func (k msgServer) RemoveContributorFromCollection(goCtx context.Context, msg *t collection := k.Collections.Get(ctx, msg.CollectionId) if msg.Creator != collection.Contributors[0] { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid creator") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid creator") } if collection.Status != types.CStatus_design { return nil, types.ErrCollectionNotInDesign diff --git a/x/cardchain/keeper/msg_server_remove_sell_offer.go b/x/cardchain/keeper/msg_server_remove_sell_offer.go index b162e253..562a92fe 100644 --- a/x/cardchain/keeper/msg_server_remove_sell_offer.go +++ b/x/cardchain/keeper/msg_server_remove_sell_offer.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) RemoveSellOffer(goCtx context.Context, msg *types.MsgRemoveSellOffer) (*types.MsgRemoveSellOfferResponse, error) { @@ -19,7 +20,7 @@ func (k msgServer) RemoveSellOffer(goCtx context.Context, msg *types.MsgRemoveSe sellOffer := k.SellOffers.Get(ctx, msg.SellOfferId) if sellOffer.Seller != msg.Creator { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect Seller") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Incorrect Seller") } if sellOffer.Status != types.SellOfferStatus_open { diff --git a/x/cardchain/keeper/msg_server_report_match.go b/x/cardchain/keeper/msg_server_report_match.go index b4367153..cab78ce5 100644 --- a/x/cardchain/keeper/msg_server_report_match.go +++ b/x/cardchain/keeper/msg_server_report_match.go @@ -4,9 +4,10 @@ import ( "context" "time" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) ReportMatch(goCtx context.Context, msg *types.MsgReportMatch) (*types.MsgReportMatchResponse, error) { @@ -19,16 +20,16 @@ func (k msgServer) ReportMatch(goCtx context.Context, msg *types.MsgReportMatch) return nil, sdkerrors.Wrap(types.ErrUserDoesNotExist, err.Error()) } if creator.ReportMatches == false { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect Reporter") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Incorrect Reporter") } if msg.Creator != match.Reporter { - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "Wrong Reporter, reporter is %s", match.Reporter) + return nil, sdkerrors.Wrapf(errors.ErrUnauthorized, "Wrong Reporter, reporter is %s", match.Reporter) } if !match.PlayerA.Confirmed && !match.PlayerB.Confirmed { return nil, sdkerrors.Wrapf(types.ErrWaitingForPlayers, "Waiting for players to report") } if !match.CoinsDistributed { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Match already reported") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Match already reported") } match.Outcome = msg.Outcome diff --git a/x/cardchain/keeper/msg_server_restart_council.go b/x/cardchain/keeper/msg_server_restart_council.go index 79f2cf00..df38863f 100644 --- a/x/cardchain/keeper/msg_server_restart_council.go +++ b/x/cardchain/keeper/msg_server_restart_council.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) RestartCouncil(goCtx context.Context, msg *types.MsgRestartCouncil) (*types.MsgRestartCouncilResponse, error) { @@ -14,7 +15,7 @@ func (k msgServer) RestartCouncil(goCtx context.Context, msg *types.MsgRestartCo council := k.Councils.Get(ctx, msg.CouncilId) card := k.Cards.Get(ctx, council.CardId) if card.Owner != msg.Creator { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid Owner") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid Owner") } if council.Status != types.CouncelingStatus_suggestionsMade { diff --git a/x/cardchain/keeper/msg_server_reveal_council_response.go b/x/cardchain/keeper/msg_server_reveal_council_response.go index 2ecda4cb..d9faab1b 100644 --- a/x/cardchain/keeper/msg_server_reveal_council_response.go +++ b/x/cardchain/keeper/msg_server_reveal_council_response.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) @@ -21,7 +22,7 @@ func (k msgServer) RevealCouncilResponse(goCtx context.Context, msg *types.MsgRe council := k.Councils.Get(ctx, msg.CouncilId) if !slices.Contains(council.Voters, msg.Creator) { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid Voter") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid Voter") } if council.Status != types.CouncelingStatus_commited { @@ -34,7 +35,7 @@ func (k msgServer) RevealCouncilResponse(goCtx context.Context, msg *types.MsgRe } if slices.Contains(allreadyVoted, msg.Creator) { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Already voted") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Already voted") } hashStringResponse := GetResponseHash(msg.Response, msg.Secret) @@ -60,7 +61,7 @@ func (k msgServer) RevealCouncilResponse(goCtx context.Context, msg *types.MsgRe err = k.BurnCoinsFromAddr(ctx, creator.Addr, sdk.Coins{collateralDeposit}) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, "Voter does not have enough coins") + return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, "Voter does not have enough coins") } council.Treasury = council.Treasury.Add(collateralDeposit) diff --git a/x/cardchain/keeper/msg_server_rewoke_council_registration.go b/x/cardchain/keeper/msg_server_rewoke_council_registration.go index f76ee33b..913f3323 100644 --- a/x/cardchain/keeper/msg_server_rewoke_council_registration.go +++ b/x/cardchain/keeper/msg_server_rewoke_council_registration.go @@ -3,9 +3,9 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) RewokeCouncilRegistration(goCtx context.Context, msg *types.MsgRewokeCouncilRegistration) (*types.MsgRewokeCouncilRegistrationResponse, error) { diff --git a/x/cardchain/keeper/msg_server_save_card_content.go b/x/cardchain/keeper/msg_server_save_card_content.go index 8e4b19d5..2f627e7b 100644 --- a/x/cardchain/keeper/msg_server_save_card_content.go +++ b/x/cardchain/keeper/msg_server_save_card_content.go @@ -4,10 +4,11 @@ import ( "context" "encoding/json" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" "github.com/DecentralCardGame/cardobject/keywords" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) SaveCardContent(goCtx context.Context, msg *types.MsgSaveCardContent) (*types.MsgSaveCardContentResponse, error) { @@ -26,9 +27,9 @@ func (k msgServer) SaveCardContent(goCtx context.Context, msg *types.MsgSaveCard //} if card.Owner == "" { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Card has no owner") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Card has no owner") } else if msg.Creator != card.Owner { // Checks if the the msg sender is the same as the current owner - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect Owner") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Incorrect Owner") } cardobj, err := keywords.Unmarshal([]byte(msg.Content)) @@ -48,7 +49,7 @@ func (k msgServer) SaveCardContent(goCtx context.Context, msg *types.MsgSaveCard if card.Status == types.Status_scheme { err = k.TransferSchemeToCard(ctx, msg.CardId, &msgOwner) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "An error accured while converting a card to a scheme: "+err.Error()) + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "An error accured while converting a card to a scheme: "+err.Error()) } } diff --git a/x/cardchain/keeper/msg_server_set_card_rarity.go b/x/cardchain/keeper/msg_server_set_card_rarity.go index 4d8fc51e..4a3b3aac 100644 --- a/x/cardchain/keeper/msg_server_set_card_rarity.go +++ b/x/cardchain/keeper/msg_server_set_card_rarity.go @@ -5,11 +5,12 @@ import ( "encoding/json" "errors" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" "github.com/DecentralCardGame/cardobject/cardobject" "github.com/DecentralCardGame/cardobject/keywords" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors2 "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) @@ -20,7 +21,7 @@ func (k msgServer) SetCardRarity(goCtx context.Context, msg *types.MsgSetCardRar collection := k.Collections.Get(ctx, msg.CollectionId) if collection.Contributors[0] != msg.Creator || !slices.Contains(collection.Cards, msg.CardId) { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect Creator") + return nil, sdkerrors.Wrap(sdkerrors2.ErrUnauthorized, "Incorrect Creator") } cardobj, err := keywords.Unmarshal(card.Content) diff --git a/x/cardchain/keeper/msg_server_set_collection_artist.go b/x/cardchain/keeper/msg_server_set_collection_artist.go index 23b9977c..d26fc995 100644 --- a/x/cardchain/keeper/msg_server_set_collection_artist.go +++ b/x/cardchain/keeper/msg_server_set_collection_artist.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) SetCollectionArtist(goCtx context.Context, msg *types.MsgSetCollectionArtist) (*types.MsgSetCollectionArtistResponse, error) { @@ -13,7 +14,7 @@ func (k msgServer) SetCollectionArtist(goCtx context.Context, msg *types.MsgSetC collection := k.Collections.Get(ctx, msg.CollectionId) if msg.Creator != collection.Contributors[0] { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid creator") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid creator") } if collection.Status != types.CStatus_design { diff --git a/x/cardchain/keeper/msg_server_set_collection_story_writer.go b/x/cardchain/keeper/msg_server_set_collection_story_writer.go index a07eccf1..6f2edc24 100644 --- a/x/cardchain/keeper/msg_server_set_collection_story_writer.go +++ b/x/cardchain/keeper/msg_server_set_collection_story_writer.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) SetCollectionStoryWriter(goCtx context.Context, msg *types.MsgSetCollectionStoryWriter) (*types.MsgSetCollectionStoryWriterResponse, error) { @@ -13,7 +14,7 @@ func (k msgServer) SetCollectionStoryWriter(goCtx context.Context, msg *types.Ms collection := k.Collections.Get(ctx, msg.CollectionId) if msg.Creator != collection.Contributors[0] { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Invalid creator") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Invalid creator") } if collection.Status != types.CStatus_design { diff --git a/x/cardchain/keeper/msg_server_set_profile_card.go b/x/cardchain/keeper/msg_server_set_profile_card.go index 0fbeacd2..cac8438f 100644 --- a/x/cardchain/keeper/msg_server_set_profile_card.go +++ b/x/cardchain/keeper/msg_server_set_profile_card.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) @@ -19,9 +20,9 @@ func (k msgServer) SetProfileCard(goCtx context.Context, msg *types.MsgSetProfil card := k.Cards.Get(ctx, msg.CardId) if card.Owner != msg.Creator { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "You have to own the card") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "You have to own the card") } else if !slices.Contains([]types.Status{types.Status_trial, types.Status_permanent}, card.Status) { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "The card has to be playable") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "The card has to be playable") } user.ProfileCard = msg.CardId diff --git a/x/cardchain/keeper/msg_server_set_user_biography.go b/x/cardchain/keeper/msg_server_set_user_biography.go index 161bfec4..05539586 100644 --- a/x/cardchain/keeper/msg_server_set_user_biography.go +++ b/x/cardchain/keeper/msg_server_set_user_biography.go @@ -3,9 +3,9 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) SetUserBiography(goCtx context.Context, msg *types.MsgSetUserBiography) (*types.MsgSetUserBiographyResponse, error) { diff --git a/x/cardchain/keeper/msg_server_set_user_website.go b/x/cardchain/keeper/msg_server_set_user_website.go index 25f18ff0..3b5f1c32 100644 --- a/x/cardchain/keeper/msg_server_set_user_website.go +++ b/x/cardchain/keeper/msg_server_set_user_website.go @@ -5,7 +5,7 @@ import ( "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" ) func (k msgServer) SetUserWebsite(goCtx context.Context, msg *types.MsgSetUserWebsite) (*types.MsgSetUserWebsiteResponse, error) { diff --git a/x/cardchain/keeper/msg_server_transfer_booster_pack.go b/x/cardchain/keeper/msg_server_transfer_booster_pack.go index 7485bd87..83ab1388 100644 --- a/x/cardchain/keeper/msg_server_transfer_booster_pack.go +++ b/x/cardchain/keeper/msg_server_transfer_booster_pack.go @@ -3,9 +3,9 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) diff --git a/x/cardchain/keeper/msg_server_transfer_card.go b/x/cardchain/keeper/msg_server_transfer_card.go index 82873c86..fdbfc847 100644 --- a/x/cardchain/keeper/msg_server_transfer_card.go +++ b/x/cardchain/keeper/msg_server_transfer_card.go @@ -3,9 +3,10 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) TransferCard(goCtx context.Context, msg *types.MsgTransferCard) (*types.MsgTransferCardResponse, error) { @@ -23,21 +24,21 @@ func (k msgServer) TransferCard(goCtx context.Context, msg *types.MsgTransferCar } if card.Owner == "" { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Card has no owner") + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Card has no owner") } else if msg.Creator != card.Owner { // Checks if the the msg sender is the same as the current owner - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "Incorrect Owner") // If not, throw an error + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, "Incorrect Owner") // If not, throw an error } if card.Status == types.Status_scheme { creator.OwnedCardSchemes, err = PopItemFromArr(msg.CardId, creator.OwnedCardSchemes) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, err.Error()) } receiver.OwnedCardSchemes = append(receiver.OwnedCardSchemes, msg.CardId) } else { creator.OwnedPrototypes, err = PopItemFromArr(msg.CardId, creator.OwnedPrototypes) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, err.Error()) + return nil, sdkerrors.Wrap(errors.ErrUnauthorized, err.Error()) } receiver.OwnedPrototypes = append(receiver.OwnedPrototypes, msg.CardId) } diff --git a/x/cardchain/keeper/msg_server_vote_card.go b/x/cardchain/keeper/msg_server_vote_card.go index 31d83d1e..e9e6ae26 100644 --- a/x/cardchain/keeper/msg_server_vote_card.go +++ b/x/cardchain/keeper/msg_server_vote_card.go @@ -3,9 +3,9 @@ package keeper import ( "context" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) func (k msgServer) VoteCard(goCtx context.Context, msg *types.MsgVoteCard) (*types.MsgVoteCardResponse, error) { @@ -16,7 +16,10 @@ func (k msgServer) VoteCard(goCtx context.Context, msg *types.MsgVoteCard) (*typ return nil, sdkerrors.Wrap(types.ErrInvalidAccAddress, "Unable to convert to AccAddress") } - k.voteCard(ctx, &voter, msg.CardId, msg.VoteType, false) + err = k.voteCard(ctx, &voter, msg.CardId, msg.VoteType, false) + if err != nil { + return nil, err + } k.incVotesAverageBy(ctx, 1) diff --git a/x/cardchain/keeper/user.go b/x/cardchain/keeper/user.go index b9597622..9153626a 100644 --- a/x/cardchain/keeper/user.go +++ b/x/cardchain/keeper/user.go @@ -1,9 +1,9 @@ package keeper import ( + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) // User Combines types.User and it's account address for better usability @@ -17,7 +17,10 @@ func (k Keeper) CreateUser(ctx sdk.Context, addr sdk.AccAddress, alias string) e // check if user already exists _, err := k.GetUser(ctx, addr) if err != nil { - k.InitUser(ctx, addr, alias) + err = k.InitUser(ctx, addr, alias) + if err != nil { + return err + } } else { return types.ErrUserAlreadyExists } @@ -25,19 +28,23 @@ func (k Keeper) CreateUser(ctx sdk.Context, addr sdk.AccAddress, alias string) e } // InitUser Initializes a new user -func (k Keeper) InitUser(ctx sdk.Context, address sdk.AccAddress, alias string) { +func (k Keeper) InitUser(ctx sdk.Context, address sdk.AccAddress, alias string) error { if alias == "" { alias = "newbie" } newUser := types.NewUser() newUser.Alias = alias - k.MintCoinsToAddr(ctx, address, sdk.Coins{sdk.NewInt64Coin("ucredits", 10000000000)}) + err := k.MintCoinsToAddr(ctx, address, sdk.Coins{sdk.NewInt64Coin("ucredits", 10000000000)}) + if err != nil { + return err + } newUser.VoteRights = k.GetVoteRightToAllCards(ctx, ctx.BlockHeight()+k.GetParams(ctx).VotingRightsExpirationTime) // TODO this might be a good thing to remove later, so that sybil voting is not possible // Yes yes remove later, this is pretty heavy on the chain and gas prices userObj := User{newUser, address} k.ClaimAirDrop(ctx, &userObj, types.AirDrop_user) k.SetUserFromUser(ctx, userObj) + return nil } // GetUser Gets a user from store diff --git a/x/cardchain/keeper/voting.go b/x/cardchain/keeper/voting.go index e16ac2dc..c9e937e4 100644 --- a/x/cardchain/keeper/voting.go +++ b/x/cardchain/keeper/voting.go @@ -3,9 +3,11 @@ package keeper import ( "fmt" + "github.com/cosmos/cosmos-sdk/types/errors" + + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "golang.org/x/exp/slices" ) @@ -37,7 +39,7 @@ func (k Keeper) voteCard( // check if card status is valid if card.Status != types.Status_permanent && card.Status != types.Status_trial { - return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Voting on a card is only possible if it is in trial or a permanent card") + return sdkerrors.Wrap(errors.ErrUnknownRequest, "Voting on a card is only possible if it is in trial or a permanent card") } switch voteType { @@ -51,7 +53,7 @@ func (k Keeper) voteCard( card.UnderpoweredVotes++ default: errMsg := fmt.Sprintf("Unrecognized card vote type: %s", voteType) - return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) + return sdkerrors.Wrap(errors.ErrUnknownRequest, errMsg) } card.Voters = append(card.Voters, voter.Addr.String()) @@ -60,13 +62,16 @@ func (k Keeper) voteCard( reward := k.GetParams(ctx).TrialVoteReward err := k.MintCoinsToAddr(ctx, voter.Addr, sdk.Coins{reward}) if err != nil { - return sdkerrors.Wrap(sdkerrors.ErrInsufficientFunds, err.Error()) + return sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error()) } card.VotePool.Sub(reward) // TODO actually if there is less than 1cr then it should be adjusted } amount := k.GetVoteReward(ctx) - k.MintCoinsToAddr(ctx, voter.Addr, sdk.Coins{amount}) + err := k.MintCoinsToAddr(ctx, voter.Addr, sdk.Coins{amount}) + if err != nil { + return err + } k.SubPoolCredits(ctx, BalancersPoolKey, amount) if !ignoreVoteRights { k.RemoveVoteRight(ctx, voter, rightsIndex) diff --git a/x/cardchain/proposal_handler.go b/x/cardchain/proposal_handler.go index 70ecc575..b375a2cb 100644 --- a/x/cardchain/proposal_handler.go +++ b/x/cardchain/proposal_handler.go @@ -3,10 +3,11 @@ package cardchain import ( "sort" + sdkerrors "cosmossdk.io/errors" "github.com/DecentralCardGame/Cardchain/x/cardchain/keeper" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" ) @@ -22,7 +23,7 @@ func NewProposalHandler(k keeper.Keeper) govtypes.Handler { return handleCollectionProposal(ctx, k, c) default: - return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized proposal content type: %T", c) + return sdkerrors.Wrapf(errors.ErrUnknownRequest, "unrecognized proposal content type: %T", c) } } } diff --git a/x/cardchain/types/errors.go b/x/cardchain/types/errors.go index 96829a2a..5a7cab41 100644 --- a/x/cardchain/types/errors.go +++ b/x/cardchain/types/errors.go @@ -3,7 +3,7 @@ package types // DONTCOVER import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrors "cosmossdk.io/errors" ) // x/cardchain module sentinel errors diff --git a/x/cardchain/types/message_add_artwork.go b/x/cardchain/types/message_add_artwork.go index c655e41f..bcbbfc0b 100644 --- a/x/cardchain/types/message_add_artwork.go +++ b/x/cardchain/types/message_add_artwork.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgAddArtwork = "add_artwork" @@ -42,7 +43,7 @@ func (msg *MsgAddArtwork) GetSignBytes() []byte { func (msg *MsgAddArtwork) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_add_artwork_test.go b/x/cardchain/types/message_add_artwork_test.go index e6dce4de..cd24cab5 100644 --- a/x/cardchain/types/message_add_artwork_test.go +++ b/x/cardchain/types/message_add_artwork_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgAddArtwork_ValidateBasic(t *testing.T) { msg: MsgAddArtwork{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgAddArtwork{ diff --git a/x/cardchain/types/message_add_artwork_to_collection.go b/x/cardchain/types/message_add_artwork_to_collection.go index 729a33f3..0f67a718 100644 --- a/x/cardchain/types/message_add_artwork_to_collection.go +++ b/x/cardchain/types/message_add_artwork_to_collection.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgAddArtworkToCollection = "add_artwork_to_collection" @@ -41,7 +42,7 @@ func (msg *MsgAddArtworkToCollection) GetSignBytes() []byte { func (msg *MsgAddArtworkToCollection) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_add_artwork_to_collection_test.go b/x/cardchain/types/message_add_artwork_to_collection_test.go index 07164b72..86321ccf 100644 --- a/x/cardchain/types/message_add_artwork_to_collection_test.go +++ b/x/cardchain/types/message_add_artwork_to_collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgAddArtworkToCollection_ValidateBasic(t *testing.T) { msg: MsgAddArtworkToCollection{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgAddArtworkToCollection{ diff --git a/x/cardchain/types/message_add_card_to_collection.go b/x/cardchain/types/message_add_card_to_collection.go index cf3a2bb1..95d97327 100644 --- a/x/cardchain/types/message_add_card_to_collection.go +++ b/x/cardchain/types/message_add_card_to_collection.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgAddCardToCollection = "add_card_to_collection" @@ -41,7 +42,7 @@ func (msg *MsgAddCardToCollection) GetSignBytes() []byte { func (msg *MsgAddCardToCollection) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_add_card_to_collection_test.go b/x/cardchain/types/message_add_card_to_collection_test.go index 9853e186..e98e69b0 100644 --- a/x/cardchain/types/message_add_card_to_collection_test.go +++ b/x/cardchain/types/message_add_card_to_collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgAddCardToCollection_ValidateBasic(t *testing.T) { msg: MsgAddCardToCollection{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgAddCardToCollection{ diff --git a/x/cardchain/types/message_add_contributor_to_collection.go b/x/cardchain/types/message_add_contributor_to_collection.go index 6b18950d..a1bdd869 100644 --- a/x/cardchain/types/message_add_contributor_to_collection.go +++ b/x/cardchain/types/message_add_contributor_to_collection.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgAddContributorToCollection = "add_contributor_to_collection" @@ -41,7 +42,7 @@ func (msg *MsgAddContributorToCollection) GetSignBytes() []byte { func (msg *MsgAddContributorToCollection) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_add_contributor_to_collection_test.go b/x/cardchain/types/message_add_contributor_to_collection_test.go index a6743f3e..db729e73 100644 --- a/x/cardchain/types/message_add_contributor_to_collection_test.go +++ b/x/cardchain/types/message_add_contributor_to_collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgAddContributorToCollection_ValidateBasic(t *testing.T) { msg: MsgAddContributorToCollection{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgAddContributorToCollection{ diff --git a/x/cardchain/types/message_add_story_to_collection.go b/x/cardchain/types/message_add_story_to_collection.go index c797d9a6..3c9c388d 100644 --- a/x/cardchain/types/message_add_story_to_collection.go +++ b/x/cardchain/types/message_add_story_to_collection.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgAddStoryToCollection = "add_story_to_collection" @@ -41,7 +42,7 @@ func (msg *MsgAddStoryToCollection) GetSignBytes() []byte { func (msg *MsgAddStoryToCollection) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_add_story_to_collection_test.go b/x/cardchain/types/message_add_story_to_collection_test.go index 1c32732f..93ab3e03 100644 --- a/x/cardchain/types/message_add_story_to_collection_test.go +++ b/x/cardchain/types/message_add_story_to_collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,9 +19,9 @@ func TestMsgAddStoryToCollection_ValidateBasic(t *testing.T) { msg: MsgAddStoryToCollection{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, }, { name: "valid address", + err: errors.ErrInvalidAddress, msg: MsgAddStoryToCollection{ Creator: sample.AccAddress(), }, diff --git a/x/cardchain/types/message_apoint_match_reporter.go b/x/cardchain/types/message_apoint_match_reporter.go index ea524ef4..cc780fb1 100644 --- a/x/cardchain/types/message_apoint_match_reporter.go +++ b/x/cardchain/types/message_apoint_match_reporter.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgApointMatchReporter = "apoint_match_reporter" @@ -40,7 +41,7 @@ func (msg *MsgApointMatchReporter) GetSignBytes() []byte { func (msg *MsgApointMatchReporter) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_apoint_match_reporter_test.go b/x/cardchain/types/message_apoint_match_reporter_test.go index 0e213ae8..bef5c873 100644 --- a/x/cardchain/types/message_apoint_match_reporter_test.go +++ b/x/cardchain/types/message_apoint_match_reporter_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgApointMatchReporter_ValidateBasic(t *testing.T) { msg: MsgApointMatchReporter{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgApointMatchReporter{ diff --git a/x/cardchain/types/message_buy_card.go b/x/cardchain/types/message_buy_card.go index 17262f9e..d65fada6 100644 --- a/x/cardchain/types/message_buy_card.go +++ b/x/cardchain/types/message_buy_card.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgBuyCard = "buy_card" @@ -40,7 +41,7 @@ func (msg *MsgBuyCard) GetSignBytes() []byte { func (msg *MsgBuyCard) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_buy_card_scheme.go b/x/cardchain/types/message_buy_card_scheme.go index a746890b..d961f094 100644 --- a/x/cardchain/types/message_buy_card_scheme.go +++ b/x/cardchain/types/message_buy_card_scheme.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgBuyCardScheme = "buy_card_scheme" @@ -40,7 +41,7 @@ func (msg MsgBuyCardScheme) GetSignBytes() []byte { func (msg *MsgBuyCardScheme) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil diff --git a/x/cardchain/types/message_buy_card_scheme_test.go b/x/cardchain/types/message_buy_card_scheme_test.go index e9f4e3b3..394ffa91 100644 --- a/x/cardchain/types/message_buy_card_scheme_test.go +++ b/x/cardchain/types/message_buy_card_scheme_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgBuyCardScheme_ValidateBasic(t *testing.T) { msg: MsgBuyCardScheme{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgBuyCardScheme{ diff --git a/x/cardchain/types/message_buy_card_test.go b/x/cardchain/types/message_buy_card_test.go index 635bc1f6..4871ea55 100644 --- a/x/cardchain/types/message_buy_card_test.go +++ b/x/cardchain/types/message_buy_card_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgBuyCard_ValidateBasic(t *testing.T) { msg: MsgBuyCard{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgBuyCard{ diff --git a/x/cardchain/types/message_buy_collection.go b/x/cardchain/types/message_buy_collection.go index 944f5c48..1d6a9e4e 100644 --- a/x/cardchain/types/message_buy_collection.go +++ b/x/cardchain/types/message_buy_collection.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgBuyCollection = "buy_collection" @@ -40,7 +41,7 @@ func (msg *MsgBuyCollection) GetSignBytes() []byte { func (msg *MsgBuyCollection) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_buy_collection_test.go b/x/cardchain/types/message_buy_collection_test.go index 3ac41043..f4af5e9f 100644 --- a/x/cardchain/types/message_buy_collection_test.go +++ b/x/cardchain/types/message_buy_collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgBuyCollection_ValidateBasic(t *testing.T) { msg: MsgBuyCollection{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgBuyCollection{ diff --git a/x/cardchain/types/message_change_artist.go b/x/cardchain/types/message_change_artist.go index 81de3fe0..20e01a8a 100644 --- a/x/cardchain/types/message_change_artist.go +++ b/x/cardchain/types/message_change_artist.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgChangeArtist = "change_artist" @@ -41,7 +42,7 @@ func (msg *MsgChangeArtist) GetSignBytes() []byte { func (msg *MsgChangeArtist) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_change_artist_test.go b/x/cardchain/types/message_change_artist_test.go index 8fb1d4f1..2e720c72 100644 --- a/x/cardchain/types/message_change_artist_test.go +++ b/x/cardchain/types/message_change_artist_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgChangeArtist_ValidateBasic(t *testing.T) { msg: MsgChangeArtist{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgChangeArtist{ diff --git a/x/cardchain/types/message_commit_council_response.go b/x/cardchain/types/message_commit_council_response.go index 435c433a..65c062df 100644 --- a/x/cardchain/types/message_commit_council_response.go +++ b/x/cardchain/types/message_commit_council_response.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgCommitCouncilResponse = "commit_council_response" @@ -42,7 +43,7 @@ func (msg *MsgCommitCouncilResponse) GetSignBytes() []byte { func (msg *MsgCommitCouncilResponse) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_commit_council_response_test.go b/x/cardchain/types/message_commit_council_response_test.go index 4d84b27e..8199b181 100644 --- a/x/cardchain/types/message_commit_council_response_test.go +++ b/x/cardchain/types/message_commit_council_response_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgCommitCouncilResponse_ValidateBasic(t *testing.T) { msg: MsgCommitCouncilResponse{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgCommitCouncilResponse{ diff --git a/x/cardchain/types/message_confirm_match.go b/x/cardchain/types/message_confirm_match.go index 95aa1511..b526f8dc 100644 --- a/x/cardchain/types/message_confirm_match.go +++ b/x/cardchain/types/message_confirm_match.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgConfirmMatch = "confirm_match" @@ -41,7 +42,7 @@ func (msg *MsgConfirmMatch) GetSignBytes() []byte { func (msg *MsgConfirmMatch) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_confirm_match_test.go b/x/cardchain/types/message_confirm_match_test.go index 3e8df40f..60a05156 100644 --- a/x/cardchain/types/message_confirm_match_test.go +++ b/x/cardchain/types/message_confirm_match_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgConfirmMatch_ValidateBasic(t *testing.T) { msg: MsgConfirmMatch{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgConfirmMatch{ diff --git a/x/cardchain/types/message_create_collection.go b/x/cardchain/types/message_create_collection.go index b24bbf01..8de78e23 100644 --- a/x/cardchain/types/message_create_collection.go +++ b/x/cardchain/types/message_create_collection.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgCreateCollection = "create_collection" @@ -43,7 +44,7 @@ func (msg *MsgCreateCollection) GetSignBytes() []byte { func (msg *MsgCreateCollection) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_create_collection_test.go b/x/cardchain/types/message_create_collection_test.go index d6652ed7..797f4c73 100644 --- a/x/cardchain/types/message_create_collection_test.go +++ b/x/cardchain/types/message_create_collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgCreateCollection_ValidateBasic(t *testing.T) { msg: MsgCreateCollection{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgCreateCollection{ diff --git a/x/cardchain/types/message_create_council.go b/x/cardchain/types/message_create_council.go index befdceb3..5aadd9a4 100644 --- a/x/cardchain/types/message_create_council.go +++ b/x/cardchain/types/message_create_council.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgCreateCouncil = "create_council" @@ -40,7 +41,7 @@ func (msg *MsgCreateCouncil) GetSignBytes() []byte { func (msg *MsgCreateCouncil) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_create_council_test.go b/x/cardchain/types/message_create_council_test.go index 6dd553c5..607e7987 100644 --- a/x/cardchain/types/message_create_council_test.go +++ b/x/cardchain/types/message_create_council_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgCreateCouncil_ValidateBasic(t *testing.T) { msg: MsgCreateCouncil{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgCreateCouncil{ diff --git a/x/cardchain/types/message_create_sell_offer.go b/x/cardchain/types/message_create_sell_offer.go index a9b6758d..4e9bd33a 100644 --- a/x/cardchain/types/message_create_sell_offer.go +++ b/x/cardchain/types/message_create_sell_offer.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgCreateSellOffer = "create_sell_offer" @@ -41,7 +42,7 @@ func (msg *MsgCreateSellOffer) GetSignBytes() []byte { func (msg *MsgCreateSellOffer) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_create_sell_offer_test.go b/x/cardchain/types/message_create_sell_offer_test.go index 449c9261..1fb520d3 100644 --- a/x/cardchain/types/message_create_sell_offer_test.go +++ b/x/cardchain/types/message_create_sell_offer_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgCreateSellOffer_ValidateBasic(t *testing.T) { msg: MsgCreateSellOffer{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgCreateSellOffer{ diff --git a/x/cardchain/types/message_createuser.go b/x/cardchain/types/message_createuser.go index 8e4e3d27..2568eb6f 100644 --- a/x/cardchain/types/message_createuser.go +++ b/x/cardchain/types/message_createuser.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgCreateuser = "createuser" @@ -49,7 +50,7 @@ func (msg *MsgCreateuser) GetSignBytes() []byte { func (msg *MsgCreateuser) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_createuser_test.go b/x/cardchain/types/message_createuser_test.go index 574fb3c1..8ca9c5b7 100644 --- a/x/cardchain/types/message_createuser_test.go +++ b/x/cardchain/types/message_createuser_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgCreateuser_ValidateBasic(t *testing.T) { msg: MsgCreateuser{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgCreateuser{ diff --git a/x/cardchain/types/message_donate_to_card.go b/x/cardchain/types/message_donate_to_card.go index ee6b1d59..b54ef0fe 100644 --- a/x/cardchain/types/message_donate_to_card.go +++ b/x/cardchain/types/message_donate_to_card.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgDonateToCard = "donate_to_card" @@ -41,7 +42,7 @@ func (msg *MsgDonateToCard) GetSignBytes() []byte { func (msg *MsgDonateToCard) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_donate_to_card_test.go b/x/cardchain/types/message_donate_to_card_test.go index e4604cc3..194c8305 100644 --- a/x/cardchain/types/message_donate_to_card_test.go +++ b/x/cardchain/types/message_donate_to_card_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgDonateToCard_ValidateBasic(t *testing.T) { msg: MsgDonateToCard{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgDonateToCard{ diff --git a/x/cardchain/types/message_finalize_collection.go b/x/cardchain/types/message_finalize_collection.go index 8884074c..4d1019ca 100644 --- a/x/cardchain/types/message_finalize_collection.go +++ b/x/cardchain/types/message_finalize_collection.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgFinalizeCollection = "finalize_collection" @@ -40,7 +41,7 @@ func (msg *MsgFinalizeCollection) GetSignBytes() []byte { func (msg *MsgFinalizeCollection) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_finalize_collection_test.go b/x/cardchain/types/message_finalize_collection_test.go index 2df69861..0391a46d 100644 --- a/x/cardchain/types/message_finalize_collection_test.go +++ b/x/cardchain/types/message_finalize_collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgFinalizeCollection_ValidateBasic(t *testing.T) { msg: MsgFinalizeCollection{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgFinalizeCollection{ diff --git a/x/cardchain/types/message_multi_vote_card.go b/x/cardchain/types/message_multi_vote_card.go index 673070fc..77c89e49 100644 --- a/x/cardchain/types/message_multi_vote_card.go +++ b/x/cardchain/types/message_multi_vote_card.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgMultiVoteCard = "multi_vote_card" @@ -39,7 +40,7 @@ func (msg *MsgMultiVoteCard) GetSignBytes() []byte { func (msg *MsgMultiVoteCard) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_multi_vote_card_test.go b/x/cardchain/types/message_multi_vote_card_test.go index 14e3f2a2..9dc82004 100644 --- a/x/cardchain/types/message_multi_vote_card_test.go +++ b/x/cardchain/types/message_multi_vote_card_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgMultiVoteCard_ValidateBasic(t *testing.T) { msg: MsgMultiVoteCard{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgMultiVoteCard{ diff --git a/x/cardchain/types/message_open_booster_pack.go b/x/cardchain/types/message_open_booster_pack.go index eae4956a..1d6b4c61 100644 --- a/x/cardchain/types/message_open_booster_pack.go +++ b/x/cardchain/types/message_open_booster_pack.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgOpenBoosterPack = "open_booster_pack" @@ -40,7 +41,7 @@ func (msg *MsgOpenBoosterPack) GetSignBytes() []byte { func (msg *MsgOpenBoosterPack) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_open_booster_pack_test.go b/x/cardchain/types/message_open_booster_pack_test.go index fb90d54e..0921ebab 100644 --- a/x/cardchain/types/message_open_booster_pack_test.go +++ b/x/cardchain/types/message_open_booster_pack_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgOpenBoosterPack_ValidateBasic(t *testing.T) { msg: MsgOpenBoosterPack{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgOpenBoosterPack{ diff --git a/x/cardchain/types/message_register_for_council.go b/x/cardchain/types/message_register_for_council.go index b25cc103..7e3d186c 100644 --- a/x/cardchain/types/message_register_for_council.go +++ b/x/cardchain/types/message_register_for_council.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgRegisterForCouncil = "register_for_council" @@ -39,7 +40,7 @@ func (msg *MsgRegisterForCouncil) GetSignBytes() []byte { func (msg *MsgRegisterForCouncil) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_register_for_council_test.go b/x/cardchain/types/message_register_for_council_test.go index b2854f30..66cf6382 100644 --- a/x/cardchain/types/message_register_for_council_test.go +++ b/x/cardchain/types/message_register_for_council_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgRegisterForCouncil_ValidateBasic(t *testing.T) { msg: MsgRegisterForCouncil{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgRegisterForCouncil{ diff --git a/x/cardchain/types/message_remove_card_from_collection.go b/x/cardchain/types/message_remove_card_from_collection.go index bf48b5e8..1c87c5aa 100644 --- a/x/cardchain/types/message_remove_card_from_collection.go +++ b/x/cardchain/types/message_remove_card_from_collection.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgRemoveCardFromCollection = "remove_card_from_collection" @@ -41,7 +42,7 @@ func (msg *MsgRemoveCardFromCollection) GetSignBytes() []byte { func (msg *MsgRemoveCardFromCollection) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_remove_card_from_collection_test.go b/x/cardchain/types/message_remove_card_from_collection_test.go index cf2cd460..cdb5ffae 100644 --- a/x/cardchain/types/message_remove_card_from_collection_test.go +++ b/x/cardchain/types/message_remove_card_from_collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgRemoveCardFromCollection_ValidateBasic(t *testing.T) { msg: MsgRemoveCardFromCollection{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgRemoveCardFromCollection{ diff --git a/x/cardchain/types/message_remove_contributor_from_collection.go b/x/cardchain/types/message_remove_contributor_from_collection.go index 81f230ad..e9ffeac0 100644 --- a/x/cardchain/types/message_remove_contributor_from_collection.go +++ b/x/cardchain/types/message_remove_contributor_from_collection.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgRemoveContributorFromCollection = "remove_contributor_from_collection" @@ -41,7 +42,7 @@ func (msg *MsgRemoveContributorFromCollection) GetSignBytes() []byte { func (msg *MsgRemoveContributorFromCollection) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_remove_contributor_from_collection_test.go b/x/cardchain/types/message_remove_contributor_from_collection_test.go index 402b7a60..e902498d 100644 --- a/x/cardchain/types/message_remove_contributor_from_collection_test.go +++ b/x/cardchain/types/message_remove_contributor_from_collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgRemoveContributorFromCollection_ValidateBasic(t *testing.T) { msg: MsgRemoveContributorFromCollection{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgRemoveContributorFromCollection{ diff --git a/x/cardchain/types/message_remove_sell_offer.go b/x/cardchain/types/message_remove_sell_offer.go index 375b4c0c..1fdcf74c 100644 --- a/x/cardchain/types/message_remove_sell_offer.go +++ b/x/cardchain/types/message_remove_sell_offer.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgRemoveSellOffer = "remove_sell_offer" @@ -40,7 +41,7 @@ func (msg *MsgRemoveSellOffer) GetSignBytes() []byte { func (msg *MsgRemoveSellOffer) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_remove_sell_offer_test.go b/x/cardchain/types/message_remove_sell_offer_test.go index 48f7a36f..fa4d8ba9 100644 --- a/x/cardchain/types/message_remove_sell_offer_test.go +++ b/x/cardchain/types/message_remove_sell_offer_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgRemoveSellOffer_ValidateBasic(t *testing.T) { msg: MsgRemoveSellOffer{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgRemoveSellOffer{ diff --git a/x/cardchain/types/message_report_match.go b/x/cardchain/types/message_report_match.go index ecf42e32..e536b125 100644 --- a/x/cardchain/types/message_report_match.go +++ b/x/cardchain/types/message_report_match.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgReportMatch = "report_match" @@ -43,7 +44,7 @@ func (msg *MsgReportMatch) GetSignBytes() []byte { func (msg *MsgReportMatch) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_report_match_test.go b/x/cardchain/types/message_report_match_test.go index b6194c24..5945be8e 100644 --- a/x/cardchain/types/message_report_match_test.go +++ b/x/cardchain/types/message_report_match_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgReportMatch_ValidateBasic(t *testing.T) { msg: MsgReportMatch{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgReportMatch{ diff --git a/x/cardchain/types/message_restart_council.go b/x/cardchain/types/message_restart_council.go index fe273566..170d6ea3 100644 --- a/x/cardchain/types/message_restart_council.go +++ b/x/cardchain/types/message_restart_council.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgRestartCouncil = "restart_council" @@ -40,7 +41,7 @@ func (msg *MsgRestartCouncil) GetSignBytes() []byte { func (msg *MsgRestartCouncil) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_restart_council_test.go b/x/cardchain/types/message_restart_council_test.go index 0848616d..e497957c 100644 --- a/x/cardchain/types/message_restart_council_test.go +++ b/x/cardchain/types/message_restart_council_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgRestartCouncil_ValidateBasic(t *testing.T) { msg: MsgRestartCouncil{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgRestartCouncil{ diff --git a/x/cardchain/types/message_reveal_council_response.go b/x/cardchain/types/message_reveal_council_response.go index 113569fa..b4712ee0 100644 --- a/x/cardchain/types/message_reveal_council_response.go +++ b/x/cardchain/types/message_reveal_council_response.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgRevealCouncilResponse = "reveal_council_response" @@ -42,7 +43,7 @@ func (msg *MsgRevealCouncilResponse) GetSignBytes() []byte { func (msg *MsgRevealCouncilResponse) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_reveal_council_response_test.go b/x/cardchain/types/message_reveal_council_response_test.go index a8f8ec0e..678c123c 100644 --- a/x/cardchain/types/message_reveal_council_response_test.go +++ b/x/cardchain/types/message_reveal_council_response_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgRevealCouncilResponse_ValidateBasic(t *testing.T) { msg: MsgRevealCouncilResponse{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgRevealCouncilResponse{ diff --git a/x/cardchain/types/message_rewoke_council_registration.go b/x/cardchain/types/message_rewoke_council_registration.go index 3d34cdbc..76652620 100644 --- a/x/cardchain/types/message_rewoke_council_registration.go +++ b/x/cardchain/types/message_rewoke_council_registration.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgRewokeCouncilRegistration = "rewoke_council_registration" @@ -39,7 +40,7 @@ func (msg *MsgRewokeCouncilRegistration) GetSignBytes() []byte { func (msg *MsgRewokeCouncilRegistration) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_rewoke_council_registration_test.go b/x/cardchain/types/message_rewoke_council_registration_test.go index ef5495f8..749e15db 100644 --- a/x/cardchain/types/message_rewoke_council_registration_test.go +++ b/x/cardchain/types/message_rewoke_council_registration_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgRewokeCouncilRegistration_ValidateBasic(t *testing.T) { msg: MsgRewokeCouncilRegistration{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgRewokeCouncilRegistration{ diff --git a/x/cardchain/types/message_save_card_content.go b/x/cardchain/types/message_save_card_content.go index a885aa56..51512f74 100644 --- a/x/cardchain/types/message_save_card_content.go +++ b/x/cardchain/types/message_save_card_content.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSaveCardContent = "save_card_content" @@ -43,7 +44,7 @@ func (msg *MsgSaveCardContent) GetSignBytes() []byte { func (msg *MsgSaveCardContent) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_save_card_content_test.go b/x/cardchain/types/message_save_card_content_test.go index 6cb77c42..caf1e227 100644 --- a/x/cardchain/types/message_save_card_content_test.go +++ b/x/cardchain/types/message_save_card_content_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgSaveCardContent_ValidateBasic(t *testing.T) { msg: MsgSaveCardContent{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSaveCardContent{ diff --git a/x/cardchain/types/message_set_card_rarity.go b/x/cardchain/types/message_set_card_rarity.go index a0f71d53..a5c173cd 100644 --- a/x/cardchain/types/message_set_card_rarity.go +++ b/x/cardchain/types/message_set_card_rarity.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSetCardRarity = "set_card_rarity" @@ -42,7 +43,7 @@ func (msg *MsgSetCardRarity) GetSignBytes() []byte { func (msg *MsgSetCardRarity) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_set_card_rarity_test.go b/x/cardchain/types/message_set_card_rarity_test.go index dd1c1ff9..c7f21b99 100644 --- a/x/cardchain/types/message_set_card_rarity_test.go +++ b/x/cardchain/types/message_set_card_rarity_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgSetCardRarity_ValidateBasic(t *testing.T) { msg: MsgSetCardRarity{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSetCardRarity{ diff --git a/x/cardchain/types/message_set_collection_artist.go b/x/cardchain/types/message_set_collection_artist.go index 9c297f18..4fa589dc 100644 --- a/x/cardchain/types/message_set_collection_artist.go +++ b/x/cardchain/types/message_set_collection_artist.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSetCollectionArtist = "set_collection_artist" @@ -41,7 +42,7 @@ func (msg *MsgSetCollectionArtist) GetSignBytes() []byte { func (msg *MsgSetCollectionArtist) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_set_collection_artist_test.go b/x/cardchain/types/message_set_collection_artist_test.go index 4f05e015..675c29e2 100644 --- a/x/cardchain/types/message_set_collection_artist_test.go +++ b/x/cardchain/types/message_set_collection_artist_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) func TestMsgSetCollectionArtist_ValidateBasic(t *testing.T) { - tests := []struct { + var tests = []struct { name string msg MsgSetCollectionArtist err error @@ -19,7 +19,7 @@ func TestMsgSetCollectionArtist_ValidateBasic(t *testing.T) { msg: MsgSetCollectionArtist{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSetCollectionArtist{ diff --git a/x/cardchain/types/message_set_collection_story_writer.go b/x/cardchain/types/message_set_collection_story_writer.go index dfaf4c5f..01db2eb7 100644 --- a/x/cardchain/types/message_set_collection_story_writer.go +++ b/x/cardchain/types/message_set_collection_story_writer.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSetCollectionStoryWriter = "set_collection_story_writer" @@ -41,7 +42,7 @@ func (msg *MsgSetCollectionStoryWriter) GetSignBytes() []byte { func (msg *MsgSetCollectionStoryWriter) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_set_collection_story_writer_test.go b/x/cardchain/types/message_set_collection_story_writer_test.go index f1b66965..8aff5d52 100644 --- a/x/cardchain/types/message_set_collection_story_writer_test.go +++ b/x/cardchain/types/message_set_collection_story_writer_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgSetCollectionStoryWriter_ValidateBasic(t *testing.T) { msg: MsgSetCollectionStoryWriter{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSetCollectionStoryWriter{ diff --git a/x/cardchain/types/message_set_profile_card.go b/x/cardchain/types/message_set_profile_card.go index 955145ac..aa5f82dc 100644 --- a/x/cardchain/types/message_set_profile_card.go +++ b/x/cardchain/types/message_set_profile_card.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSetProfileCard = "set_profile_card" @@ -40,7 +41,7 @@ func (msg *MsgSetProfileCard) GetSignBytes() []byte { func (msg *MsgSetProfileCard) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_set_profile_card_test.go b/x/cardchain/types/message_set_profile_card_test.go index 9239a095..cc2d6d07 100644 --- a/x/cardchain/types/message_set_profile_card_test.go +++ b/x/cardchain/types/message_set_profile_card_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgSetProfileCard_ValidateBasic(t *testing.T) { msg: MsgSetProfileCard{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSetProfileCard{ diff --git a/x/cardchain/types/message_set_user_biography.go b/x/cardchain/types/message_set_user_biography.go index e398c535..50a39e78 100644 --- a/x/cardchain/types/message_set_user_biography.go +++ b/x/cardchain/types/message_set_user_biography.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSetUserBiography = "set_user_biography" @@ -40,7 +41,7 @@ func (msg *MsgSetUserBiography) GetSignBytes() []byte { func (msg *MsgSetUserBiography) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_set_user_biography_test.go b/x/cardchain/types/message_set_user_biography_test.go index 7f3e0bea..a6ee84dd 100644 --- a/x/cardchain/types/message_set_user_biography_test.go +++ b/x/cardchain/types/message_set_user_biography_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgSetUserBiography_ValidateBasic(t *testing.T) { msg: MsgSetUserBiography{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSetUserBiography{ diff --git a/x/cardchain/types/message_set_user_website.go b/x/cardchain/types/message_set_user_website.go index daae40f8..939a777b 100644 --- a/x/cardchain/types/message_set_user_website.go +++ b/x/cardchain/types/message_set_user_website.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSetUserWebsite = "set_user_website" @@ -40,7 +41,7 @@ func (msg *MsgSetUserWebsite) GetSignBytes() []byte { func (msg *MsgSetUserWebsite) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_set_user_website_test.go b/x/cardchain/types/message_set_user_website_test.go index d733b971..d7385d9a 100644 --- a/x/cardchain/types/message_set_user_website_test.go +++ b/x/cardchain/types/message_set_user_website_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgSetUserWebsite_ValidateBasic(t *testing.T) { msg: MsgSetUserWebsite{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSetUserWebsite{ diff --git a/x/cardchain/types/message_submit_collection_proposal.go b/x/cardchain/types/message_submit_collection_proposal.go index c594f4e1..704f5211 100644 --- a/x/cardchain/types/message_submit_collection_proposal.go +++ b/x/cardchain/types/message_submit_collection_proposal.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSubmitCollectionProposal = "submit_collection_proposal" @@ -40,7 +41,7 @@ func (msg *MsgSubmitCollectionProposal) GetSignBytes() []byte { func (msg *MsgSubmitCollectionProposal) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_submit_collection_proposal_test.go b/x/cardchain/types/message_submit_collection_proposal_test.go index 681afc4f..2bd3e0a1 100644 --- a/x/cardchain/types/message_submit_collection_proposal_test.go +++ b/x/cardchain/types/message_submit_collection_proposal_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgSubmitCollectionProposal_ValidateBasic(t *testing.T) { msg: MsgSubmitCollectionProposal{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSubmitCollectionProposal{ diff --git a/x/cardchain/types/message_submit_copyright_proposal.go b/x/cardchain/types/message_submit_copyright_proposal.go index a50e2a98..72ec6f61 100644 --- a/x/cardchain/types/message_submit_copyright_proposal.go +++ b/x/cardchain/types/message_submit_copyright_proposal.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSubmitCopyrightProposal = "submit_copyright_proposal" @@ -42,7 +43,7 @@ func (msg *MsgSubmitCopyrightProposal) GetSignBytes() []byte { func (msg *MsgSubmitCopyrightProposal) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_submit_copyright_proposal_test.go b/x/cardchain/types/message_submit_copyright_proposal_test.go index 94a6fc06..d433545d 100644 --- a/x/cardchain/types/message_submit_copyright_proposal_test.go +++ b/x/cardchain/types/message_submit_copyright_proposal_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgSubmitCopyrightProposal_ValidateBasic(t *testing.T) { msg: MsgSubmitCopyrightProposal{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSubmitCopyrightProposal{ diff --git a/x/cardchain/types/message_submit_match_reporter_proposal.go b/x/cardchain/types/message_submit_match_reporter_proposal.go index 78c94471..d2a7b8a5 100644 --- a/x/cardchain/types/message_submit_match_reporter_proposal.go +++ b/x/cardchain/types/message_submit_match_reporter_proposal.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgSubmitMatchReporterProposal = "submit_match_reporter_proposal" @@ -42,7 +43,7 @@ func (msg *MsgSubmitMatchReporterProposal) GetSignBytes() []byte { func (msg *MsgSubmitMatchReporterProposal) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_submit_match_reporter_proposal_test.go b/x/cardchain/types/message_submit_match_reporter_proposal_test.go index ff61f9f4..fe5bea64 100644 --- a/x/cardchain/types/message_submit_match_reporter_proposal_test.go +++ b/x/cardchain/types/message_submit_match_reporter_proposal_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgSubmitMatchReporterProposal_ValidateBasic(t *testing.T) { msg: MsgSubmitMatchReporterProposal{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgSubmitMatchReporterProposal{ diff --git a/x/cardchain/types/message_transfer_booster_pack.go b/x/cardchain/types/message_transfer_booster_pack.go index 28fe4997..bf628d96 100644 --- a/x/cardchain/types/message_transfer_booster_pack.go +++ b/x/cardchain/types/message_transfer_booster_pack.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgTransferBoosterPack = "transfer_booster_pack" @@ -41,7 +42,7 @@ func (msg *MsgTransferBoosterPack) GetSignBytes() []byte { func (msg *MsgTransferBoosterPack) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_transfer_booster_pack_test.go b/x/cardchain/types/message_transfer_booster_pack_test.go index 1e9aafb7..7c2ac31f 100644 --- a/x/cardchain/types/message_transfer_booster_pack_test.go +++ b/x/cardchain/types/message_transfer_booster_pack_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgTransferBoosterPack_ValidateBasic(t *testing.T) { msg: MsgTransferBoosterPack{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgTransferBoosterPack{ diff --git a/x/cardchain/types/message_transfer_card.go b/x/cardchain/types/message_transfer_card.go index 6fa95096..c6d606bd 100644 --- a/x/cardchain/types/message_transfer_card.go +++ b/x/cardchain/types/message_transfer_card.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgTransferCard = "transfer_card" @@ -41,7 +42,7 @@ func (msg *MsgTransferCard) GetSignBytes() []byte { func (msg *MsgTransferCard) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_transfer_card_test.go b/x/cardchain/types/message_transfer_card_test.go index 399a19d9..1c4b5ae8 100644 --- a/x/cardchain/types/message_transfer_card_test.go +++ b/x/cardchain/types/message_transfer_card_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgTransferCard_ValidateBasic(t *testing.T) { msg: MsgTransferCard{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgTransferCard{ diff --git a/x/cardchain/types/message_vote_card.go b/x/cardchain/types/message_vote_card.go index 2e281667..24010901 100644 --- a/x/cardchain/types/message_vote_card.go +++ b/x/cardchain/types/message_vote_card.go @@ -1,8 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" ) const TypeMsgVoteCard = "vote_card" @@ -41,7 +42,7 @@ func (msg *MsgVoteCard) GetSignBytes() []byte { func (msg *MsgVoteCard) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Creator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err) + return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid creator address (%s)", err) } return nil } diff --git a/x/cardchain/types/message_vote_card_test.go b/x/cardchain/types/message_vote_card_test.go index 336d60fe..cae806fe 100644 --- a/x/cardchain/types/message_vote_card_test.go +++ b/x/cardchain/types/message_vote_card_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/DecentralCardGame/Cardchain/testutil/sample" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) @@ -19,7 +19,7 @@ func TestMsgVoteCard_ValidateBasic(t *testing.T) { msg: MsgVoteCard{ Creator: "invalid_address", }, - err: sdkerrors.ErrInvalidAddress, + err: errors.ErrInvalidAddress, }, { name: "valid address", msg: MsgVoteCard{