Skip to content

Commit

Permalink
update farm module path
Browse files Browse the repository at this point in the history
  • Loading branch information
dreamer-zq committed Jun 24, 2024
1 parent 2accfe1 commit d996d0a
Show file tree
Hide file tree
Showing 37 changed files with 308 additions and 357 deletions.
4 changes: 2 additions & 2 deletions modules/farm/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package farm
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/irisnet/irismod/farm/keeper"
"github.com/irisnet/irismod/farm/types"
"mods.irisnet.org/farm/keeper"
"mods.irisnet.org/farm/types"
)

// EndBlocker handles block beginning logic for farm
Expand Down
12 changes: 6 additions & 6 deletions modules/farm/client/cli/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ package cli_test
// "github.com/cosmos/cosmos-sdk/client/flags"
// sdk "github.com/cosmos/cosmos-sdk/types"

// coinswaptypes "github.com/irisnet/irismod/modules/coinswap/types"
// tokentypes "github.com/irisnet/irismod/modules/token/types/v1"
// "github.com/irisnet/irismod/simapp"
// farmcli "github.com/irisnet/irismod/farm/client/cli"
// "github.com/irisnet/irismod/farm/client/testutil"
// farmtypes "github.com/irisnet/irismod/farm/types"
// coinswaptypes "mods.irisnet.org/modules/coinswap/types"
// tokentypes "mods.irisnet.org/modules/token/types/v1"
// "mods.irisnet.org/simapp"
// farmcli "mods.irisnet.org/farm/client/cli"
// "mods.irisnet.org/farm/client/testutil"
// farmtypes "mods.irisnet.org/farm/types"
// )

// type IntegrationTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion modules/farm/client/cli/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/version"

"github.com/irisnet/irismod/farm/types"
"mods.irisnet.org/farm/types"
)

// GetQueryCmd returns the cli query commands for the farm module.
Expand Down
2 changes: 1 addition & 1 deletion modules/farm/client/cli/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/version"

"github.com/irisnet/irismod/farm/types"
"mods.irisnet.org/farm/types"
)

// NewTxCmd returns the transaction commands for the farm module.
Expand Down
12 changes: 6 additions & 6 deletions modules/farm/client/testutil/grpc_query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ package testutil_test
// "github.com/cosmos/cosmos-sdk/testutil"
// sdk "github.com/cosmos/cosmos-sdk/types"

// coinswaptypes "github.com/irisnet/irismod/modules/coinswap/types"
// tokentypes "github.com/irisnet/irismod/modules/token/types/v1"
// "github.com/irisnet/irismod/simapp"
// farmcli "github.com/irisnet/irismod/farm/client/cli"
// farmtestutil "github.com/irisnet/irismod/farm/client/testutil"
// farmtypes "github.com/irisnet/irismod/farm/types"
// coinswaptypes "mods.irisnet.org/modules/coinswap/types"
// tokentypes "mods.irisnet.org/modules/token/types/v1"
// "mods.irisnet.org/simapp"
// farmcli "mods.irisnet.org/farm/client/cli"
// farmtestutil "mods.irisnet.org/farm/client/testutil"
// farmtypes "mods.irisnet.org/farm/types"
// )

// type IntegrationTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions modules/farm/client/testutil/test_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package testutil
// "github.com/cosmos/cosmos-sdk/client"
// "github.com/cosmos/cosmos-sdk/client/flags"

// "github.com/irisnet/irismod/simapp"
// farmcli "github.com/irisnet/irismod/farm/client/cli"
// farmtypes "github.com/irisnet/irismod/farm/types"
// "mods.irisnet.org/simapp"
// farmcli "mods.irisnet.org/farm/client/cli"
// farmtypes "mods.irisnet.org/farm/types"
// )

// // CreateFarmPoolExec creates a redelegate message.
Expand Down
11 changes: 5 additions & 6 deletions modules/farm/depinject.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"

modulev1 "github.com/irisnet/irismod/api/irismod/farm/module/v1"
"github.com/irisnet/irismod/farm/keeper"
"github.com/irisnet/irismod/farm/types"
"github.com/irisnet/irismod/types/exported"
modulev1 "mods.irisnet.org/api/irismod/farm/module/v1"
"mods.irisnet.org/farm/keeper"
"mods.irisnet.org/farm/types"
)

// App Wiring Setup
Expand All @@ -23,7 +22,7 @@ func init() {
)
}

func ProvideKeyTable() exported.KeyTable {
func ProvideKeyTable() types.KeyTable {
return types.ParamKeyTable() //nolint:staticcheck
}

Expand All @@ -49,7 +48,7 @@ type FarmInputs struct {
CoinswapKeeper types.CoinswapKeeper

// LegacySubspace is used solely for migration of x/params managed parameters
LegacySubspace exported.Subspace `optional:"true"`
LegacySubspace types.Subspace `optional:"true"`
}

type FarmOutputs struct {
Expand Down
4 changes: 2 additions & 2 deletions modules/farm/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package farm
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/irisnet/irismod/farm/keeper"
"github.com/irisnet/irismod/farm/types"
"mods.irisnet.org/farm/keeper"
"mods.irisnet.org/farm/types"
)

// InitGenesis stores the genesis state
Expand Down
36 changes: 11 additions & 25 deletions modules/farm/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
module github.com/irisnet/irismod/farm
module mods.irisnet.org/farm

go 1.19

require (
cosmossdk.io/api v0.3.1
cosmossdk.io/core v0.5.1
cosmossdk.io/depinject v1.0.0-alpha.4
cosmossdk.io/errors v1.0.1
Expand All @@ -14,12 +15,15 @@ require (
github.com/golang/protobuf v1.5.3
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/irisnet/irismod v1.9.0
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.32.0
mods.irisnet.org/api v1.0.0-beta
mods.irisnet.org/coinswap v1.0.0-beta
mods.irisnet.org/simapp v1.0.0-beta
sigs.k8s.io/yaml v1.3.0
)

Expand All @@ -29,15 +33,12 @@ require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
cloud.google.com/go/storage v1.30.1 // indirect
cosmossdk.io/api v0.3.1 // indirect
cosmossdk.io/log v1.3.1 // indirect
cosmossdk.io/tools/rosetta v0.2.1 // indirect
filippo.io/edwards25519 v1.0.0 // 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 v1.0.0 // indirect
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/aws/aws-sdk-go v1.44.203 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -64,15 +65,13 @@ require (
github.com/creachadair/taskgroup v0.3.2 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
github.com/ethereum/go-ethereum v1.10.26 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/getsentry/sentry-go v0.23.0 // indirect
Expand All @@ -81,8 +80,6 @@ require (
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.1 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand Down Expand Up @@ -111,8 +108,6 @@ require (
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.0 // indirect
github.com/huandu/skiplist v1.2.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
Expand All @@ -127,15 +122,13 @@ require (
github.com/manifoldco/promptui v0.9.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
Expand All @@ -145,14 +138,12 @@ require (
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/tsdb v0.7.1 // indirect
github.com/rakyll/statik v0.1.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/rs/zerolog v1.32.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
Expand All @@ -162,15 +153,7 @@ require (
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
github.com/tidwall/btree v1.6.0 // indirect
github.com/tidwall/gjson v1.14.4 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zondax/hid v0.9.2 // indirect
github.com/zondax/ledger-go v0.14.3 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
Expand All @@ -190,9 +173,7 @@ require (
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
nhooyr.io/websocket v1.8.6 // indirect
Expand All @@ -210,4 +191,9 @@ replace (
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
// Downgraded to avoid bugs in following commits which caused simulations to fail.
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

// TODO
mods.irisnet.org/api => ../../api
mods.irisnet.org/coinswap => ../coinswap
mods.irisnet.org/simapp => ../../simapp
)
Loading

0 comments on commit d996d0a

Please sign in to comment.