chore: add basic tx and queries

simapp/app.go

@@ -156,6 +156,7 @@ var (
 		stakingtypes.BondedPoolName:    {authtypes.Burner, authtypes.Staking},
 		stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
 		govtypes.ModuleName:            {authtypes.Burner},
+		fswaptypes.ModuleName:          {authtypes.Burner, authtypes.Minter},
 	}
 
 	// module accounts that are allowed to receive tokens

x/fswap/keeper/expected_keepers.go

@@ -0,0 +1,19 @@
+package keeper
+
+import (
+	sdk "github.com/Finschia/finschia-sdk/types"
+)
+
+type (
+	AccountKeeper interface {
+		GetModuleAddress(name string) sdk.AccAddress
+	}
+
+	BankKeeper interface {
+		HasBalance(ctx sdk.Context, addr sdk.AccAddress, amt sdk.Coin) bool
+		GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin
+		SendCoins(ctx sdk.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins) error
+		MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
+		BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
+	}
+)

x/fswap/keeper/genesis.go

@@ -16,7 +16,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) error
 		return fmt.Errorf("cannot initialize genesis state, there are more than 1 swapped")
 	}
 	for _, fswapInit := range genState.GetFswapInit() {
-		if err := k.SetFswapInit(ctx, fswapInit); err != nil {
+		if err := k.setFswapInit(ctx, fswapInit); err != nil {
 			panic(err)
 		}
 	}
@@ -31,7 +31,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) error
 // ExportGenesis returns the module's exported genesis.
 func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 	return &types.GenesisState{
-		FswapInit: k.GetAllFswapInits(ctx),
-		Swapped:   k.GetAllSwapped(ctx),
+		FswapInit: k.getAllFswapInits(ctx),
+		Swapped:   k.getAllSwapped(ctx),
 	}
 }

x/fswap/keeper/genesis_test.go

@@ -5,7 +5,7 @@ import (
 )
 
 func (s *KeeperTestSuite) TestInitAndExportGenesis() {
-	ctx, _ := s.sdkCtx.CacheContext()
+	ctx, _ := s.ctx.CacheContext()
 	defaultGenesis := types.DefaultGenesis()
 	err := s.keeper.InitGenesis(ctx, defaultGenesis)
 	s.Require().NoError(err)

x/fswap/keeper/grpc_query.go

@@ -7,33 +7,6 @@ import (
 	"github.com/Finschia/finschia-sdk/x/fswap/types"
 )
 
-//var _ types.QueryServer = Keeper{}
-//
-//// todo this files is just for test
-//// Swapped implements types.QueryServer.
-//func (k Keeper) Swapped(ctx context.Context, req *types.QuerySwappedRequest) (*types.QuerySwappedResponse, error) {
-//	sdkCtx := sdk.UnwrapSDKContext(ctx)
-//	check := k.GetFswap(sdkCtx)
-//
-//	return &types.QuerySwappedResponse{
-//		OldCoinAmount: sdk.NewCoin(check.FromDenom, sdk.ZeroInt()),
-//		NewCoinAmount: sdk.NewCoin(check.ToDenom, sdk.ZeroInt()),
-//	}, nil
-//}
-//
-//// TotalSwappableAmount implements types.QueryServer.
-//func (k Keeper) TotalSwappableAmount(context.Context, *types.QueryTotalSwappableAmountRequest) (*types.QueryTotalSwappableAmountResponse, error) {
-//	//TODO implement me
-//	panic("unimplemented")
-//	// sdkCtx := sdk.UnwrapSDKContext(ctx)
-//	// totalSwappableAmount := k.GetParams(sdkCtx).SwappableNewCoinAmount
-//	// swapped := k.GetSwapped(sdkCtx)
-//	// swappableNewCoin := sdk.NewCoin(k.config.NewCoinDenom, totalSwappableAmount.Sub(swapped.NewCoinAmount))
-//	// return &types.QueryTotalSwappableAmountResponse{
-//	// 	SwappableNewCoin: swappableNewCoin,
-//	// }, nil
-//}
-
 var _ types.QueryServer = QueryServer{}
 
 type QueryServer struct {
@@ -48,18 +21,23 @@ func NewQueryServer(keeper Keeper) *QueryServer {
 
 func (s QueryServer) Swapped(ctx context.Context, _ *types.QuerySwappedRequest) (*types.QuerySwappedResponse, error) {
 	c := sdk.UnwrapSDKContext(ctx)
-	allSwapped := s.Keeper.GetAllSwapped(c)
-	if len(allSwapped) == 0 {
-		return nil, types.ErrSwappedNotFound
+	swapped, err := s.Keeper.getSwapped(c)
+	if err != nil {
+		return nil, err
 	}
-	swapped := allSwapped[0]
 	return &types.QuerySwappedResponse{
 		OldCoinAmount: swapped.GetOldCoinAmount(),
 		NewCoinAmount: swapped.GetNewCoinAmount(),
 	}, nil
 }
 
-func (s QueryServer) TotalSwappableAmount(_ context.Context, _ *types.QueryTotalSwappableAmountRequest) (*types.QueryTotalSwappableAmountResponse, error) {
-	// s.Keeper.GetSwappableNewCoinAmount()
-	return nil, nil
+func (s QueryServer) TotalSwappableAmount(ctx context.Context, _ *types.QueryTotalSwappableAmountRequest) (*types.QueryTotalSwappableAmountResponse, error) {
+	c := sdk.UnwrapSDKContext(ctx)
+	amount, err := s.Keeper.getSwappableNewCoinAmount(c)
+	if err != nil {
+		return &types.QueryTotalSwappableAmountResponse{}, err
+	}
+	return &types.QueryTotalSwappableAmountResponse{
+		SwappableNewCoin: amount,
+	}, nil
 }