diff --git a/golang/cosmos/app/app.go b/golang/cosmos/app/app.go index 57f73d69a4e..94fa6f8d9f4 100644 --- a/golang/cosmos/app/app.go +++ b/golang/cosmos/app/app.go @@ -82,10 +82,10 @@ import ( capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts" + "cosmossdk.io/log" dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" tmos "github.com/cometbft/cometbft/libs/os" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" icahost "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host" diff --git a/golang/cosmos/x/swingset/keeper/extension_snapshotter.go b/golang/cosmos/x/swingset/keeper/extension_snapshotter.go index 175ac0249f6..b734e4a1ae7 100644 --- a/golang/cosmos/x/swingset/keeper/extension_snapshotter.go +++ b/golang/cosmos/x/swingset/keeper/extension_snapshotter.go @@ -7,10 +7,10 @@ import ( "io" "math" + "cosmossdk.io/log" snapshots "cosmossdk.io/store/snapshots/types" agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types" "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types" - "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/baseapp" ) diff --git a/golang/cosmos/x/swingset/keeper/extension_snapshotter_test.go b/golang/cosmos/x/swingset/keeper/extension_snapshotter_test.go index 342cf04081e..3b4d8c560d8 100644 --- a/golang/cosmos/x/swingset/keeper/extension_snapshotter_test.go +++ b/golang/cosmos/x/swingset/keeper/extension_snapshotter_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" ) func newTestExtensionSnapshotter() *ExtensionSnapshotter { diff --git a/golang/cosmos/x/swingset/keeper/keeper.go b/golang/cosmos/x/swingset/keeper/keeper.go index d745151c5a1..467237d0987 100644 --- a/golang/cosmos/x/swingset/keeper/keeper.go +++ b/golang/cosmos/x/swingset/keeper/keeper.go @@ -7,10 +7,8 @@ import ( stdlog "log" "math" + "cosmossdk.io/log" sdkmath "cosmossdk.io/math" - - "github.com/cometbft/cometbft/libs/log" - "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/baseapp" @@ -323,8 +321,8 @@ func (k Keeper) ChargeBeans( beansToDebit := nowOwing.Sub(remainderOwing) // Convert the debit to coins. - beansPerFeeUnitDec := sdk.NewDecFromBigInt(beansPerUnit[types.BeansPerFeeUnit].BigInt()) - beansToDebitDec := sdk.NewDecFromBigInt(beansToDebit.BigInt()) + beansPerFeeUnitDec := sdkmath.LegacyNewDecFromBigInt(beansPerUnit[types.BeansPerFeeUnit].BigInt()) + beansToDebitDec := sdkmath.LegacyNewDecFromBigInt(beansToDebit.BigInt()) feeUnitPrice := k.GetParams(ctx).FeeUnitPrice feeDecCoins := sdk.NewDecCoinsFromCoins(feeUnitPrice...).MulDec(beansToDebitDec).QuoDec(beansPerFeeUnitDec)