Skip to content

Commit 1dba8a6

Browse files
tnv1tnv1
authored
Improve interchaintest (#207)
1 parent 572db84 commit 1dba8a6

File tree

6 files changed

+85
-47
lines changed

6 files changed

+85
-47
lines changed

‎tests/interchaintest/host_zone_proposal_test.go‎

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,57 @@ import (
44
"context"
55
"testing"
66

7+
"go.uber.org/zap/zaptest"
8+
9+
"github.com/strangelove-ventures/interchaintest/v7"
710
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
811
"github.com/stretchr/testify/require"
912

10-
feeabsCli "github.com/osmosis-labs/fee-abstraction/v7/tests/interchaintest/feeabs"
13+
feeabstest "github.com/osmosis-labs/fee-abstraction/v7/tests/interchaintest/feeabs"
1114
)
1215

1316
func TestHostZoneProposal(t *testing.T) {
1417
if testing.Short() {
1518
t.Skip("skipping in short mode")
1619
}
17-
ctx := context.Background()
1820

19-
chains, users, channels := SetupChain(t, ctx)
20-
feeabs, _, osmosis := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain), chains[2].(*cosmos.CosmosChain)
21-
channFeeabsOsmosis, _, channFeeabsOsmosisICQ := channels[0], channels[1], channels[6]
21+
t.Parallel()
2222

23-
feeabsUser, _, _ := users[0], users[1], users[2]
24-
osmoOnFeeabs := GetOsmoOnFeeabs(channFeeabsOsmosis, osmosis.Config().Denom)
23+
numVals, numFullNodes := 1, 1
2524

26-
ParamChangeProposal(t, ctx, feeabs, feeabsUser, &channFeeabsOsmosis, &channFeeabsOsmosisICQ, osmoOnFeeabs)
25+
cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{
26+
{
27+
Name: "feeabs",
28+
ChainConfig: feeabsConfig,
29+
NumValidators: &numVals,
30+
NumFullNodes: &numFullNodes,
31+
},
32+
})
33+
34+
chains, err := cf.Chains(t.Name())
35+
require.NoError(t, err)
36+
37+
feeabs := chains[0].(*cosmos.CosmosChain)
38+
39+
ic := interchaintest.NewInterchain().AddChain(feeabs)
40+
client, network := interchaintest.DockerSetup(t)
41+
ctx := context.Background()
42+
require.NoError(t, ic.Build(ctx, nil, interchaintest.InterchainBuildOptions{
43+
TestName: t.Name(),
44+
Client: client,
45+
NetworkID: network,
46+
SkipPathCreation: true,
47+
}))
48+
t.Cleanup(func() {
49+
_ = ic.Close()
50+
})
51+
52+
users := interchaintest.GetAndFundTestUsers(t, ctx, t.Name(), genesisWalletAmount.Int64(), feeabs)
53+
feeabsUser := users[0]
54+
55+
ParamChangeProposal(t, ctx, feeabs, feeabsUser, "channel-0", "channel-1", fakeIBCDenom)
2756
AddHostZoneProposal(t, ctx, feeabs, feeabsUser)
2857

29-
_, err := feeabsCli.QueryHostZoneConfigWithDenom(feeabs, ctx, osmoOnFeeabs)
58+
_, err = feeabstest.QueryHostZoneConfigWithDenom(feeabs, ctx, fakeIBCDenom)
3059
require.NoError(t, err)
3160
}

‎tests/interchaintest/ibc_transfer_customfee_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
"cosmossdk.io/math"
1010
sdk "github.com/cosmos/cosmos-sdk/types"
11-
sdktypes "github.com/cosmos/cosmos-sdk/types"
1211
transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
1312
feeabsCli "github.com/osmosis-labs/fee-abstraction/v7/tests/interchaintest/feeabs"
1413
"github.com/osmosis-labs/fee-abstraction/v7/tests/interchaintest/tendermint"
@@ -41,7 +40,7 @@ func TestFeeabsGaiaIBCTransferWithIBCFee(t *testing.T) {
4140
require.NoError(t, err)
4241
_ = crossChainRegistryContractID
4342
// // Instatiate
44-
owner := sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
43+
owner := sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
4544
initMsg := fmt.Sprintf("{\"owner\":\"%s\"}", owner)
4645
registryContractAddress, err := osmosis.InstantiateContract(ctx, osmosisUser.KeyName(), crossChainRegistryContractID, initMsg, true)
4746
require.NoError(t, err)
@@ -73,20 +72,21 @@ func TestFeeabsGaiaIBCTransferWithIBCFee(t *testing.T) {
7372
// Create pool Osmosis(uatom)/Osmosis(stake) on Osmosis
7473
denomTrace := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom(channOsmosisGaia.PortID, channOsmosisGaia.ChannelID, gaia.Config().Denom))
7574
uatomOnOsmosis := denomTrace.IBCDenom()
76-
osmosisUserBalance, err := osmosis.GetBalance(ctx, sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), uatomOnOsmosis)
75+
osmosisUserBalance, err := osmosis.GetBalance(ctx, sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), uatomOnOsmosis)
7776
require.NoError(t, err)
7877
require.Equal(t, amountToSend, osmosisUserBalance)
7978

8079
denomTrace = transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom(channOsmosisFeeabs.PortID, channOsmosisFeeabs.ChannelID, feeabs.Config().Denom))
8180
stakeOnOsmosis := denomTrace.IBCDenom()
82-
osmosisUserBalance, err = osmosis.GetBalance(ctx, sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), stakeOnOsmosis)
81+
osmosisUserBalance, err = osmosis.GetBalance(ctx, sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), stakeOnOsmosis)
8382
require.NoError(t, err)
8483
require.Equal(t, amountToSend, osmosisUserBalance)
8584

8685
// Create pool Osmosis(stake)/uosmo on Osmosis, with 1:1 ratio
86+
initAmount := amountToSend.Int64() / 10
8787
poolID, err := feeabsCli.CreatePool(osmosis, ctx, osmosisUser.KeyName(), cosmos.OsmosisPoolParams{
8888
Weights: fmt.Sprintf("5%s,5%s", stakeOnOsmosis, osmosis.Config().Denom),
89-
InitialDeposit: fmt.Sprintf("95000000%s,95000000%s", stakeOnOsmosis, osmosis.Config().Denom),
89+
InitialDeposit: fmt.Sprintf("%d%s,%d%s", initAmount, stakeOnOsmosis, initAmount, osmosis.Config().Denom),
9090
SwapFee: "0.01",
9191
ExitFee: "0",
9292
FutureGovernor: "",
@@ -129,7 +129,7 @@ func TestFeeabsGaiaIBCTransferWithIBCFee(t *testing.T) {
129129
// Setup feeabs module & add host zone via proposals
130130
////////////////////////////////////////////////////////////////////////////////////////
131131

132-
ParamChangeProposal(t, ctx, feeabs, feeabsUser, &channFeeabsOsmosis, &channFeeabsOsmosisICQ, stakeOnOsmosis)
132+
ParamChangeProposal(t, ctx, feeabs, feeabsUser, channFeeabsOsmosis.ChannelID, channFeeabsOsmosisICQ.ChannelID, stakeOnOsmosis)
133133
AddHostZoneProposal(t, ctx, feeabs, feeabsUser)
134134
_, err = feeabsCli.QueryAllHostZoneConfig(feeabs, ctx)
135135
require.NoError(t, err)
@@ -145,8 +145,8 @@ func TestFeeabsGaiaIBCTransferWithIBCFee(t *testing.T) {
145145
// Get our Bech32 encoded user addresses
146146
feeabsUser, gaiaUser := users[0], users[1]
147147

148-
feeabsUserAddr := sdktypes.MustBech32ifyAddressBytes(feeabs.Config().Bech32Prefix, feeabsUser.Address())
149-
gaiaUserAddr := sdktypes.MustBech32ifyAddressBytes(gaia.Config().Bech32Prefix, gaiaUser.Address())
148+
feeabsUserAddr := sdk.MustBech32ifyAddressBytes(feeabs.Config().Bech32Prefix, feeabsUser.Address())
149+
gaiaUserAddr := sdk.MustBech32ifyAddressBytes(gaia.Config().Bech32Prefix, gaiaUser.Address())
150150

151151
// Compose an IBC transfer and send from Gaia -> Feeabs
152152
osmoTokenDenom := transfertypes.GetPrefixedDenom(channFeeabsOsmosis.PortID, channFeeabsOsmosis.ChannelID, osmosis.Config().Denom)

‎tests/interchaintest/ibc_transfer_test.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77

88
"cosmossdk.io/math"
9-
sdktypes "github.com/cosmos/cosmos-sdk/types"
9+
sdk "github.com/cosmos/cosmos-sdk/types"
1010
transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
1111
"github.com/strangelove-ventures/interchaintest/v7"
1212
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
@@ -113,8 +113,8 @@ func TestFeeabsGaiaIBCTransfer(t *testing.T) {
113113
// Get our Bech32 encoded user addresses
114114
feeabsUser, gaiaUser := users[0], users[1]
115115

116-
feeabsUserAddr := sdktypes.MustBech32ifyAddressBytes(feeabs.Config().Bech32Prefix, feeabsUser.Address())
117-
gaiaUserAddr := sdktypes.MustBech32ifyAddressBytes(gaia.Config().Bech32Prefix, gaiaUser.Address())
116+
feeabsUserAddr := sdk.MustBech32ifyAddressBytes(feeabs.Config().Bech32Prefix, feeabsUser.Address())
117+
gaiaUserAddr := sdk.MustBech32ifyAddressBytes(gaia.Config().Bech32Prefix, gaiaUser.Address())
118118

119119
// Get original account balances
120120
feeabsOrigBal, err := feeabs.GetBalance(ctx, feeabsUserAddr, feeabs.Config().Denom)
@@ -126,11 +126,10 @@ func TestFeeabsGaiaIBCTransfer(t *testing.T) {
126126
require.Equal(t, genesisWalletAmount, gaiaOrigBal)
127127

128128
// Compose an IBC transfer and send from feeabs -> Gaia
129-
transferAmount := math.NewInt(1_000)
130129
transfer := ibc.WalletAmount{
131130
Address: gaiaUserAddr,
132131
Denom: feeabs.Config().Denom,
133-
Amount: transferAmount,
132+
Amount: amountToSend,
134133
}
135134

136135
channel, err := ibc.GetTransferChannel(ctx, r, eRep, feeabs.Config().ChainID, gaia.Config().ChainID)
@@ -155,17 +154,17 @@ func TestFeeabsGaiaIBCTransfer(t *testing.T) {
155154
require.NoError(t, err)
156155

157156
// The feeabs account should have the original balance minus the transfer amount and the fee
158-
require.GreaterOrEqual(t, feeabsOrigBal.Sub(transferAmount).Int64(), feeabsUpdateBal.Int64())
157+
require.GreaterOrEqual(t, feeabsOrigBal.Sub(amountToSend).Int64(), feeabsUpdateBal.Int64())
159158

160159
gaiaUpdateBal, err := gaia.GetBalance(ctx, gaiaUserAddr, feeabsIBCDenom)
161160
require.NoError(t, err)
162-
require.Equal(t, transferAmount, gaiaUpdateBal)
161+
require.Equal(t, amountToSend, gaiaUpdateBal)
163162

164163
// Compose an IBC transfer and send from Gaia -> Feeabs
165164
transfer = ibc.WalletAmount{
166165
Address: feeabsUserAddr,
167166
Denom: feeabsIBCDenom,
168-
Amount: transferAmount,
167+
Amount: amountToSend,
169168
}
170169

171170
transferTx, err = gaia.SendIBCTransfer(ctx, channel.Counterparty.ChannelID, gaiaUserAddr, transfer, ibc.TransferOptions{})
@@ -181,7 +180,7 @@ func TestFeeabsGaiaIBCTransfer(t *testing.T) {
181180
// Assert that the funds are now back on feeabs and not on Gaia
182181
feeabsBalAfterGettingBackToken, err := feeabs.GetBalance(ctx, feeabsUserAddr, feeabs.Config().Denom)
183182
require.NoError(t, err)
184-
require.Equal(t, feeabsUpdateBal.Add(transferAmount).Int64(), feeabsBalAfterGettingBackToken.Int64())
183+
require.Equal(t, feeabsUpdateBal.Add(amountToSend).Int64(), feeabsBalAfterGettingBackToken.Int64())
185184

186185
gaiaUpdateBal, err = gaia.GetBalance(ctx, gaiaUserAddr, feeabsIBCDenom)
187186
require.NoError(t, err)

‎tests/interchaintest/packet_foward_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"testing"
77

8-
sdktypes "github.com/cosmos/cosmos-sdk/types"
8+
sdk "github.com/cosmos/cosmos-sdk/types"
99
transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
1010
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
1111
"github.com/strangelove-ventures/interchaintest/v7/testutil"
@@ -33,7 +33,7 @@ func TestPacketForwardMiddleware(t *testing.T) {
3333
require.NoError(t, err)
3434
_ = crossChainRegistryContractID
3535
// // Instatiate
36-
owner := sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
36+
owner := sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
3737
initMsg := fmt.Sprintf("{\"owner\":\"%s\"}", owner)
3838
registryContractAddress, err := osmosis.InstantiateContract(ctx, osmosisUser.KeyName(), crossChainRegistryContractID, initMsg, true)
3939
require.NoError(t, err)
@@ -65,19 +65,20 @@ func TestPacketForwardMiddleware(t *testing.T) {
6565
// Create pool Osmosis(uatom)/Osmosis(stake) on Osmosis
6666
denomTrace := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom(channOsmosisGaia.PortID, channOsmosisGaia.ChannelID, gaia.Config().Denom))
6767
uatomOnOsmosis := denomTrace.IBCDenom()
68-
osmosisUserBalance, err := osmosis.GetBalance(ctx, sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), uatomOnOsmosis)
68+
osmosisUserBalance, err := osmosis.GetBalance(ctx, sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), uatomOnOsmosis)
6969
require.NoError(t, err)
7070
require.Equal(t, amountToSend, osmosisUserBalance)
7171

7272
denomTrace = transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom(channOsmosisFeeabs.PortID, channOsmosisFeeabs.ChannelID, feeabs.Config().Denom))
7373
stakeOnOsmosis := denomTrace.IBCDenom()
74-
osmosisUserBalance, err = osmosis.GetBalance(ctx, sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), stakeOnOsmosis)
74+
osmosisUserBalance, err = osmosis.GetBalance(ctx, sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), stakeOnOsmosis)
7575
require.NoError(t, err)
7676
require.Equal(t, amountToSend, osmosisUserBalance)
7777

78+
initAmount := amountToSend.Int64() / 10
7879
poolID, err := feeabsCli.CreatePool(osmosis, ctx, osmosisUser.KeyName(), cosmos.OsmosisPoolParams{
79-
Weights: fmt.Sprintf("5%s,5%s", stakeOnOsmosis, uatomOnOsmosis),
80-
InitialDeposit: fmt.Sprintf("95000000%s,950000000%s", stakeOnOsmosis, uatomOnOsmosis),
80+
Weights: fmt.Sprintf("5%s,5%s", stakeOnOsmosis, osmosis.Config().Denom),
81+
InitialDeposit: fmt.Sprintf("%d%s,%d%s", initAmount, stakeOnOsmosis, initAmount, osmosis.Config().Denom),
8182
SwapFee: "0.01",
8283
ExitFee: "0",
8384
FutureGovernor: "",

‎tests/interchaintest/query_osmosis_twap_test.go‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path"
99
"testing"
1010

11-
sdktypes "github.com/cosmos/cosmos-sdk/types"
11+
sdk "github.com/cosmos/cosmos-sdk/types"
1212
paramsutils "github.com/cosmos/cosmos-sdk/x/params/client/utils"
1313
transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
1414
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
@@ -38,7 +38,7 @@ func TestQueryOsmosisTwap(t *testing.T) {
3838
require.NoError(t, err)
3939
_ = crossChainRegistryContractID
4040
// // Instatiate
41-
owner := sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
41+
owner := sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
4242
initMsg := fmt.Sprintf("{\"owner\":\"%s\"}", owner)
4343
registryContractAddress, err := osmosis.InstantiateContract(ctx, osmosisUser.KeyName(), crossChainRegistryContractID, initMsg, true)
4444
require.NoError(t, err)
@@ -69,13 +69,14 @@ func TestQueryOsmosisTwap(t *testing.T) {
6969

7070
// Create pool Osmosis(stake)/uosmo on Osmosis
7171
stakeOnOsmosis := GetStakeOnOsmosis(channOsmosisFeeabs, feeabs.Config().Denom)
72-
osmosisUserBalance, err := osmosis.GetBalance(ctx, sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), stakeOnOsmosis)
72+
osmosisUserBalance, err := osmosis.GetBalance(ctx, sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address()), stakeOnOsmosis)
7373
require.NoError(t, err)
7474
require.Equal(t, amountToSend, osmosisUserBalance)
7575

76+
initAmount := amountToSend.Int64() / 10
7677
poolID, err := feeabsCli.CreatePool(osmosis, ctx, osmosisUser.KeyName(), cosmos.OsmosisPoolParams{
7778
Weights: fmt.Sprintf("5%s,5%s", stakeOnOsmosis, osmosis.Config().Denom),
78-
InitialDeposit: fmt.Sprintf("95000000%s,950000000%s", stakeOnOsmosis, osmosis.Config().Denom),
79+
InitialDeposit: fmt.Sprintf("%d%s,%d%s", initAmount, stakeOnOsmosis, initAmount, osmosis.Config().Denom),
7980
SwapFee: "0.01",
8081
ExitFee: "0",
8182
FutureGovernor: "",
@@ -98,7 +99,7 @@ func TestQueryOsmosisTwap(t *testing.T) {
9899
err = osmosis.QueryContract(ctx, registryContractAddress, queryMsg, &res)
99100
require.NoError(t, err)
100101

101-
ParamChangeProposal(t, ctx, feeabs, feeabsUser, &channFeeabsOsmosis, &channFeeabsOsmosisICQ, stakeOnOsmosis)
102+
ParamChangeProposal(t, ctx, feeabs, feeabsUser, channFeeabsOsmosis.ChannelID, channFeeabsOsmosisICQ.ChannelID, stakeOnOsmosis)
102103
AddHostZoneProposal(t, ctx, feeabs, feeabsUser)
103104

104105
// ensure that the host zone is added
@@ -120,7 +121,14 @@ func TestQueryOsmosisTwap(t *testing.T) {
120121
require.NoError(t, err)
121122
}
122123

123-
func ParamChangeProposal(t *testing.T, ctx context.Context, feeabs *cosmos.CosmosChain, feeabsUser ibc.Wallet, channFeeabsOsmosis, channFeeabsOsmosisFeeabs *ibc.ChannelOutput, stakeOnOsmosis string) {
124+
func ParamChangeProposal(
125+
t *testing.T,
126+
ctx context.Context,
127+
feeabs *cosmos.CosmosChain,
128+
feeabsUser ibc.Wallet,
129+
channFeeabsOsmosis, channFeeabsOsmosisFeeabs string,
130+
stakeOnOsmosis string,
131+
) {
124132
t.Helper()
125133
// propose to change feeabs parameters accordingly to the ibcdenom
126134
curDir, _ := os.Getwd()
@@ -133,12 +141,12 @@ func ParamChangeProposal(t *testing.T, ctx context.Context, feeabs *cosmos.Cosmo
133141
for i := range changeParamProposal.Changes {
134142
change := &changeParamProposal.Changes[i]
135143
if change.Subspace == "feeabs" && change.Key == "IbcTransferChannel" {
136-
fmt.Println("ibc transfer channel changed", channFeeabsOsmosis.ChannelID)
137-
change.Value = json.RawMessage(fmt.Sprintf("\"%s\"", channFeeabsOsmosis.ChannelID))
144+
fmt.Println("ibc transfer channel changed", channFeeabsOsmosis)
145+
change.Value = json.RawMessage(fmt.Sprintf("\"%s\"", channFeeabsOsmosis))
138146
}
139147
if change.Subspace == "feeabs" && change.Key == "IbcQueryIcqChannel" {
140-
fmt.Println("ibc query icq channel changed", channFeeabsOsmosisFeeabs.ChannelID)
141-
change.Value = json.RawMessage(fmt.Sprintf("\"%s\"", channFeeabsOsmosisFeeabs.ChannelID))
148+
fmt.Println("ibc query icq channel changed", channFeeabsOsmosisFeeabs)
149+
change.Value = json.RawMessage(fmt.Sprintf("\"%s\"", channFeeabsOsmosisFeeabs))
142150
}
143151
if change.Subspace == "feeabs" && change.Key == "NativeIbcedInOsmosis" {
144152
fmt.Println("NativeIbcedInOsmosis changed", stakeOnOsmosis)

‎tests/interchaintest/setup.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010

1111
"cosmossdk.io/math"
12-
sdktypes "github.com/cosmos/cosmos-sdk/types"
12+
sdk "github.com/cosmos/cosmos-sdk/types"
1313
moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
1414
"github.com/icza/dyno"
1515
"github.com/strangelove-ventures/interchaintest/v7"
@@ -84,6 +84,7 @@ var (
8484
pathOsmosisGaia = "osmosis-gaia"
8585
genesisWalletAmount = math.NewInt(100_000_000_000)
8686
amountToSend = math.NewInt(1_000_000_000)
87+
fakeIBCDenom = "ibc/0471F1C4E7AFD3F07702BEF6DC365268D64570F7C1FDC98EA6098DD6DE59817B"
8788
)
8889

8990
// feeabsEncoding registers the feeabs specific module codecs so that the associated types and msgs
@@ -462,7 +463,7 @@ func SetupChain(t *testing.T, ctx context.Context) ([]ibc.Chain, []ibc.Wallet, [
462463
// Send Gaia uatom to Osmosis
463464
gaiaHeight, err := gaia.Height(ctx)
464465
require.NoError(t, err)
465-
dstAddress := sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
466+
dstAddress := sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
466467
transfer := ibc.WalletAmount{
467468
Address: dstAddress,
468469
Denom: gaia.Config().Denom,
@@ -481,7 +482,7 @@ func SetupChain(t *testing.T, ctx context.Context) ([]ibc.Chain, []ibc.Wallet, [
481482
// Send Feeabs stake to Osmosis
482483
feeabsHeight, err := feeabs.Height(ctx)
483484
require.NoError(t, err)
484-
dstAddress = sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
485+
dstAddress = sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, osmosisUser.Address())
485486
transfer = ibc.WalletAmount{
486487
Address: dstAddress,
487488
Denom: feeabs.Config().Denom,
@@ -500,7 +501,7 @@ func SetupChain(t *testing.T, ctx context.Context) ([]ibc.Chain, []ibc.Wallet, [
500501
// Send Gaia uatom to Feeabs
501502
gaiaHeight, err = gaia.Height(ctx)
502503
require.NoError(t, err)
503-
dstAddress = sdktypes.MustBech32ifyAddressBytes(feeabs.Config().Bech32Prefix, feeabsUser.Address())
504+
dstAddress = sdk.MustBech32ifyAddressBytes(feeabs.Config().Bech32Prefix, feeabsUser.Address())
504505
transfer = ibc.WalletAmount{
505506
Address: dstAddress,
506507
Denom: gaia.Config().Denom,
@@ -556,7 +557,7 @@ func SetupOsmosisContracts(t *testing.T,
556557

557558
// Instantiate contracts
558559
// 1. Crosschain Registry Contract
559-
owner := sdktypes.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, user.Address())
560+
owner := sdk.MustBech32ifyAddressBytes(osmosis.Config().Bech32Prefix, user.Address())
560561
initMsg := fmt.Sprintf("{\"owner\":\"%s\"}", owner)
561562

562563
registryContractAddr, err := osmosis.InstantiateContract(ctx, user.KeyName(), registryCodeId, initMsg, true)

0 commit comments

Comments
 (0)