chore: improve dependency cycles

noble-assets · Oct 18, 2023 · d4e5e04 · d4e5e04
1 parent bee832a
commit d4e5e04
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 30 deletions.
diff --git a/app/ante.go b/app/ante.go
@@ -1,9 +1,9 @@
 package app
 
 import (
-	fiattokenfactory "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
-	fiattokenfactorytypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
+	fiattokenfactory "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/keeper"
+	fiattokenfactorytypes "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/types"
 	tokenfactory "github.com/strangelove-ventures/noble/v4/x/tokenfactory/keeper"
 	tokenfactorytypes "github.com/strangelove-ventures/noble/v4/x/tokenfactory/types"
 

diff --git a/app/app.go b/app/app.go
@@ -87,12 +87,12 @@ import (
 	tmos "github.com/tendermint/tendermint/libs/os"
 	dbm "github.com/tendermint/tm-db"
 
-	fiattokenfactorymodule "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory"
-	fiattokenfactorymodulekeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
-	fiattokenfactorymoduletypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	fiattokenfactorymodule "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory"
+	fiattokenfactorymodulekeeper "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/keeper"
+	fiattokenfactorymoduletypes "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/types"
 	"github.com/strangelove-ventures/noble/v4/app/upgrades/argon"
 	"github.com/strangelove-ventures/noble/v4/app/upgrades/argon4"
 	"github.com/strangelove-ventures/noble/v4/app/upgrades/neon"

diff --git a/app/upgrades/argon/upgrade.go b/app/upgrades/argon/upgrade.go
@@ -6,10 +6,10 @@ import (
 	"cosmossdk.io/math"
 	cctpkeeper "github.com/circlefin/noble-cctp/x/cctp/keeper"
 	cctptypes "github.com/circlefin/noble-cctp/x/cctp/types"
-	fiattokenfactorykeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	fiattokenfactorykeeper "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/keeper"
 	paramauthoritykeeper "github.com/strangelove-ventures/paramauthority/x/params/keeper"
 )
 

diff --git a/app/upgrades/neon/store.go b/app/upgrades/neon/store.go
@@ -5,7 +5,7 @@ import (
 	storeTypes "github.com/cosmos/cosmos-sdk/store/types"
 
 	// FiatTokenFactory
-	fiatTokenFactoryTypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
+	fiatTokenFactoryTypes "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/types"
 	// Upgrade
 	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )

diff --git a/app/upgrades/neon/upgrade.go b/app/upgrades/neon/upgrade.go
@@ -8,10 +8,10 @@ import (
 
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory"
-	fiattokenfactorykeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
-	fiattokenfactorytypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	"github.com/strangelove-ventures/noble/v3/x/fiattokenfactory"
+	fiattokenfactorykeeper "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/keeper"
+	fiattokenfactorytypes "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/types"
 )
 
 func initialFiatTokenFactoryState() fiattokenfactorytypes.GenesisState {

diff --git a/app/upgrades/radon/upgrade.go b/app/upgrades/radon/upgrade.go
@@ -6,8 +6,8 @@ import (
 
 	paramauthoritykeeper "github.com/strangelove-ventures/paramauthority/x/params/keeper"
 
-	fiattokenfactorykeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	fiattokenfactorykeeper "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/keeper"
 	globalfeetypes "github.com/strangelove-ventures/noble/v4/x/globalfee/types"
 
 	tarifftypes "github.com/strangelove-ventures/noble/v4/x/tariff/types"

diff --git a/go.mod b/go.mod
@@ -6,7 +6,6 @@ require (
 	cosmossdk.io/errors v1.0.0
 	cosmossdk.io/math v1.0.1
 	github.com/circlefin/noble-cctp v0.0.0-20231013164358-dc81b3e0d566
-	github.com/circlefin/noble-fiattokenfactory v1.0.0
 	github.com/cosmos/cosmos-sdk v0.45.16
 	github.com/cosmos/ibc-go/v3 v3.4.0
 	github.com/gogo/protobuf v1.3.3
@@ -16,6 +15,7 @@ require (
 	github.com/spf13/cast v1.5.1
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
+	github.com/strangelove-ventures/noble/v3 v3.1.1-0.20231018130830-bf303b3705b1
 	github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.5
 	github.com/strangelove-ventures/paramauthority v1.0.0
 	github.com/stretchr/testify v1.8.4
@@ -40,6 +40,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.1 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -151,8 +152,7 @@ require (
 )
 
 replace (
-	github.com/circlefin/noble-cctp => github.com/noble-assets/cctp v0.0.0-20231017104045-821e63c6c4cb
-	github.com/circlefin/noble-fiattokenfactory => github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc
+	github.com/circlefin/noble-cctp => github.com/noble-assets/cctp v0.0.0-20231018131215-a07aa6aabfe1
 
 	// huckleberry patch for ibc-go v3
 	github.com/cosmos/ibc-go/v3 => github.com/noble-assets/ibc-go/v3 v3.4.0-huckleberry

diff --git a/go.sum b/go.sum
@@ -764,10 +764,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/noble-assets/cctp v0.0.0-20231017104045-821e63c6c4cb h1:3hfZp1F9tODzmOpn8h7/jF24GrlWiGYM4c99Jy8jrIE=
-github.com/noble-assets/cctp v0.0.0-20231017104045-821e63c6c4cb/go.mod h1:1ZvRyADVcYsTc19Amu32UzEhQnTqrbCm1qU1elKmcAI=
-github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc h1:rB/yl4XrL5uMchI9iCAoGpWetuOpzLjw23tUmasDYKI=
-github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc/go.mod h1:CfnRGSj43vzFKVjHMmxB5HE3B16ZjU1T4+Lo+7leYgA=
+github.com/noble-assets/cctp v0.0.0-20231018131215-a07aa6aabfe1 h1:PAW4/KmcTDa4vLZdRDWw5g3olezmTrwCsT559Ympty0=
+github.com/noble-assets/cctp v0.0.0-20231018131215-a07aa6aabfe1/go.mod h1:hEq08yRBU0cePndr6v1FbpxacRAcrG6itSxChd0wh00=
 github.com/noble-assets/ibc-go/v3 v3.4.0-huckleberry h1:02oo/GHLGITexbPNUO/jmYa67xE+B5BvNv/i+wufdHI=
 github.com/noble-assets/ibc-go/v3 v3.4.0-huckleberry/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
@@ -953,6 +951,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU=
 github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As=
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
+github.com/strangelove-ventures/noble/v3 v3.1.1-0.20231018130830-bf303b3705b1 h1:3E6BRPbN6mxIiTEcv2jMHdA6YrMgSVAIIETBfJmf600=
+github.com/strangelove-ventures/noble/v3 v3.1.1-0.20231018130830-bf303b3705b1/go.mod h1:r9Dvf0pG2TL04AeXKBfZFr1cNkXPlbdqxRkbFFT/BnA=
 github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.5 h1:iXXjziCSAebzuRUPFSnqD7epSDB8LEPgkh9zhbj7ha4=
 github.com/strangelove-ventures/packet-forward-middleware/v3 v3.1.5/go.mod h1:ncgsf5rykh36HkM16BNcKKx1XzVRdWXt+4pph1syDHE=
 github.com/strangelove-ventures/paramauthority v1.0.0 h1:kgWsSfkiBh25ZZyt/ZQUwXEVdFknX9YIdEWDm1X7AWg=

diff --git a/interchaintest/go.mod b/interchaintest/go.mod
@@ -5,12 +5,12 @@ go 1.21
 require (
 	cosmossdk.io/math v1.0.1
 	github.com/circlefin/noble-cctp v0.0.0-20231013164358-dc81b3e0d566
-	github.com/circlefin/noble-fiattokenfactory v1.0.0
 	github.com/cosmos/cosmos-sdk v0.45.16
 	github.com/cosmos/ibc-go/v3 v3.4.0
 	github.com/ethereum/go-ethereum v1.12.2
 	github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845
 	github.com/strangelove-ventures/interchaintest/v3 v3.0.0-20230622221919-28c608364e27
+	github.com/strangelove-ventures/noble/v3 v3.1.1-0.20231018130830-bf303b3705b1
 	github.com/strangelove-ventures/noble/v4 v4.0.0
 	github.com/strangelove-ventures/paramauthority v1.0.0
 	github.com/stretchr/testify v1.8.4
@@ -185,8 +185,7 @@ replace (
 	github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
 	github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0
 
-	github.com/circlefin/noble-cctp => github.com/noble-assets/cctp v0.0.0-20231017104045-821e63c6c4cb
-	github.com/circlefin/noble-fiattokenfactory => github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc
+	github.com/circlefin/noble-cctp => github.com/noble-assets/cctp v0.0.0-20231018131215-a07aa6aabfe1
 
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 

diff --git a/interchaintest/go.sum b/interchaintest/go.sum
@@ -807,10 +807,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/noble-assets/cctp v0.0.0-20231017104045-821e63c6c4cb h1:3hfZp1F9tODzmOpn8h7/jF24GrlWiGYM4c99Jy8jrIE=
-github.com/noble-assets/cctp v0.0.0-20231017104045-821e63c6c4cb/go.mod h1:1ZvRyADVcYsTc19Amu32UzEhQnTqrbCm1qU1elKmcAI=
-github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc h1:rB/yl4XrL5uMchI9iCAoGpWetuOpzLjw23tUmasDYKI=
-github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc/go.mod h1:CfnRGSj43vzFKVjHMmxB5HE3B16ZjU1T4+Lo+7leYgA=
+github.com/noble-assets/cctp v0.0.0-20231018131215-a07aa6aabfe1 h1:PAW4/KmcTDa4vLZdRDWw5g3olezmTrwCsT559Ympty0=
+github.com/noble-assets/cctp v0.0.0-20231018131215-a07aa6aabfe1/go.mod h1:hEq08yRBU0cePndr6v1FbpxacRAcrG6itSxChd0wh00=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
@@ -1007,6 +1005,8 @@ github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jH
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
 github.com/strangelove-ventures/interchaintest/v3 v3.0.0-20230622221919-28c608364e27 h1:oJ9yZIFp3yRTlH8BOLnACrsjR1fPIpHyOoLFjM5VRBc=
 github.com/strangelove-ventures/interchaintest/v3 v3.0.0-20230622221919-28c608364e27/go.mod h1:dWv7E8XtgidmA/A5Gy9x76qMIygES+SxPTnlWjYUb7g=
+github.com/strangelove-ventures/noble/v3 v3.1.1-0.20231018130830-bf303b3705b1 h1:3E6BRPbN6mxIiTEcv2jMHdA6YrMgSVAIIETBfJmf600=
+github.com/strangelove-ventures/noble/v3 v3.1.1-0.20231018130830-bf303b3705b1/go.mod h1:r9Dvf0pG2TL04AeXKBfZFr1cNkXPlbdqxRkbFFT/BnA=
 github.com/strangelove-ventures/paramauthority v1.0.0 h1:kgWsSfkiBh25ZZyt/ZQUwXEVdFknX9YIdEWDm1X7AWg=
 github.com/strangelove-ventures/paramauthority v1.0.0/go.mod h1:31HVpoItQMa4Wj2BimVhQWbIYeb+kdUDJ8MzBEbGj28=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=

diff --git a/interchaintest/upgrade_radon_test.go b/interchaintest/upgrade_radon_test.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"testing"
 
-	fiattokenfactorytypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/strangelove-ventures/interchaintest/v3/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v3/ibc"
+	fiattokenfactorytypes "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/types"
 	globalfeetypes "github.com/strangelove-ventures/noble/v4/x/globalfee/types"
 	"github.com/stretchr/testify/require"
 )

diff --git a/testutil/keeper/fiattokenfactory.go b/testutil/keeper/fiattokenfactory.go
@@ -3,14 +3,14 @@ package keeper
 import (
 	"testing"
 
-	"github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
-	"github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	typesparams "github.com/cosmos/cosmos-sdk/x/params/types"
+	"github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/keeper"
+	"github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/types"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

diff --git a/x/blockibc/blockibc.go b/x/blockibc/blockibc.go
@@ -1,8 +1,6 @@
 package blockibc
 
 import (
-	fiatKeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
-	fiat_types "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -11,6 +9,8 @@ import (
 	channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
 	porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
 	ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
+	fiatKeeper "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/keeper"
+	fiat_types "github.com/strangelove-ventures/noble/v3/x/fiattokenfactory/types"
 	"github.com/strangelove-ventures/noble/v4/x/tokenfactory/keeper"
 	"github.com/strangelove-ventures/noble/v4/x/tokenfactory/types"
 )