refactor: Rename x/vault -> x/dwn and x/service -> x/svc

x/dwn/keeper/genesis_test.go

@@ -0,0 +1,22 @@
+package keeper_test
+
+import (
+	"testing"
+
+	"github.com/onsonr/sonr/x/dwn/types"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGenesis(t *testing.T) {
+	f := SetupTest(t)
+
+	genesisState := &types.GenesisState{
+		Params: types.DefaultParams(),
+	}
+
+	f.k.InitGenesis(f.ctx, genesisState)
+
+	got := f.k.ExportGenesis(f.ctx)
+	require.NotNil(t, got)
+
+}

x/dwn/keeper/keeper.go

@@ -0,0 +1,102 @@
+package keeper
+
+import (
+	"context"
+
+	"github.com/cosmos/cosmos-sdk/codec"
+
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+
+	"cosmossdk.io/collections"
+	storetypes "cosmossdk.io/core/store"
+	"cosmossdk.io/log"
+	"cosmossdk.io/orm/model/ormdb"
+
+	apiv1 "github.com/onsonr/sonr/api/dwn/v1"
+	"github.com/onsonr/sonr/x/dwn/types"
+)
+
+type Keeper struct {
+	cdc codec.BinaryCodec
+
+	logger log.Logger
+
+	// state management
+	Schema collections.Schema
+	Params collections.Item[types.Params]
+	OrmDB  apiv1.StateStore
+
+	authority string
+}
+
+// NewKeeper creates a new Keeper instance
+func NewKeeper(
+	cdc codec.BinaryCodec,
+	storeService storetypes.KVStoreService,
+	logger log.Logger,
+	authority string,
+) Keeper {
+	logger = logger.With(log.ModuleKey, "x/"+types.ModuleName)
+
+	sb := collections.NewSchemaBuilder(storeService)
+
+	if authority == "" {
+		authority = authtypes.NewModuleAddress(govtypes.ModuleName).String()
+	}
+
+	db, err := ormdb.NewModuleDB(&types.ORMModuleSchema, ormdb.ModuleDBOptions{KVStoreService: storeService})
+	if err != nil {
+		panic(err)
+	}
+
+	store, err := apiv1.NewStateStore(db)
+	if err != nil {
+		panic(err)
+	}
+
+	k := Keeper{
+		cdc:    cdc,
+		logger: logger,
+
+		Params: collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)),
+		OrmDB:  store,
+
+		authority: authority,
+	}
+
+	schema, err := sb.Build()
+	if err != nil {
+		panic(err)
+	}
+
+	k.Schema = schema
+
+	return k
+}
+
+func (k Keeper) Logger() log.Logger {
+	return k.logger
+}
+
+// InitGenesis initializes the module's state from a genesis state.
+func (k *Keeper) InitGenesis(ctx context.Context, data *types.GenesisState) error {
+
+	if err := data.Params.Validate(); err != nil {
+		return err
+	}
+
+	return k.Params.Set(ctx, data.Params)
+}
+
+// ExportGenesis exports the module's state to a genesis state.
+func (k *Keeper) ExportGenesis(ctx context.Context) *types.GenesisState {
+	params, err := k.Params.Get(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	return &types.GenesisState{
+		Params: params,
+	}
+}

x/dwn/keeper/keeper_test.go

@@ -0,0 +1,133 @@
+package keeper_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/suite"
+
+	"cosmossdk.io/log"
+	storetypes "cosmossdk.io/store/types"
+
+	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	"github.com/cosmos/cosmos-sdk/runtime"
+	"github.com/cosmos/cosmos-sdk/testutil/integration"
+	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
+	authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec"
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+	mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
+	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
+	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+
+	module "github.com/onsonr/sonr/x/dwn"
+	"github.com/onsonr/sonr/x/dwn/keeper"
+	"github.com/onsonr/sonr/x/dwn/types"
+)
+
+var maccPerms = map[string][]string{
+	authtypes.FeeCollectorName:     nil,
+	stakingtypes.BondedPoolName:    {authtypes.Burner, authtypes.Staking},
+	stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
+	minttypes.ModuleName:           {authtypes.Minter},
+	govtypes.ModuleName:            {authtypes.Burner},
+}
+
+type testFixture struct {
+	suite.Suite
+
+	ctx         sdk.Context
+	k           keeper.Keeper
+	msgServer   types.MsgServer
+	queryServer types.QueryServer
+	appModule   *module.AppModule
+
+	accountkeeper authkeeper.AccountKeeper
+	bankkeeper    bankkeeper.BaseKeeper
+	stakingKeeper *stakingkeeper.Keeper
+	mintkeeper    mintkeeper.Keeper
+
+	addrs      []sdk.AccAddress
+	govModAddr string
+}
+
+func SetupTest(t *testing.T) *testFixture {
+	t.Helper()
+	f := new(testFixture)
+
+	// Base setup
+	logger := log.NewTestLogger(t)
+	encCfg := moduletestutil.MakeTestEncodingConfig()
+
+	f.govModAddr = authtypes.NewModuleAddress(govtypes.ModuleName).String()
+	f.addrs = simtestutil.CreateIncrementalAccounts(3)
+
+	keys := storetypes.NewKVStoreKeys(authtypes.ModuleName, banktypes.ModuleName, stakingtypes.ModuleName, minttypes.ModuleName, types.ModuleName)
+	f.ctx = sdk.NewContext(integration.CreateMultiStore(keys, logger), cmtproto.Header{}, false, logger)
+
+	// Register SDK modules.
+	registerBaseSDKModules(logger, f, encCfg, keys)
+
+	// Setup Keeper.
+	f.k = keeper.NewKeeper(encCfg.Codec, runtime.NewKVStoreService(keys[types.ModuleName]), logger, f.govModAddr)
+	f.msgServer = keeper.NewMsgServerImpl(f.k)
+	f.queryServer = keeper.NewQuerier(f.k)
+	f.appModule = module.NewAppModule(encCfg.Codec, f.k)
+
+	return f
+}
+
+func registerModuleInterfaces(encCfg moduletestutil.TestEncodingConfig) {
+	authtypes.RegisterInterfaces(encCfg.InterfaceRegistry)
+	stakingtypes.RegisterInterfaces(encCfg.InterfaceRegistry)
+	banktypes.RegisterInterfaces(encCfg.InterfaceRegistry)
+	minttypes.RegisterInterfaces(encCfg.InterfaceRegistry)
+
+	types.RegisterInterfaces(encCfg.InterfaceRegistry)
+}
+
+func registerBaseSDKModules(
+	logger log.Logger,
+	f *testFixture,
+	encCfg moduletestutil.TestEncodingConfig,
+	keys map[string]*storetypes.KVStoreKey,
+) {
+	registerModuleInterfaces(encCfg)
+
+	// Auth Keeper.
+	f.accountkeeper = authkeeper.NewAccountKeeper(
+		encCfg.Codec, runtime.NewKVStoreService(keys[authtypes.StoreKey]),
+		authtypes.ProtoBaseAccount,
+		maccPerms,
+		authcodec.NewBech32Codec(sdk.Bech32MainPrefix), sdk.Bech32MainPrefix,
+		f.govModAddr,
+	)
+
+	// Bank Keeper.
+	f.bankkeeper = bankkeeper.NewBaseKeeper(
+		encCfg.Codec, runtime.NewKVStoreService(keys[banktypes.StoreKey]),
+		f.accountkeeper,
+		nil,
+		f.govModAddr, logger,
+	)
+
+	// Staking Keeper.
+	f.stakingKeeper = stakingkeeper.NewKeeper(
+		encCfg.Codec, runtime.NewKVStoreService(keys[stakingtypes.StoreKey]),
+		f.accountkeeper, f.bankkeeper, f.govModAddr,
+		authcodec.NewBech32Codec(sdk.Bech32PrefixValAddr),
+		authcodec.NewBech32Codec(sdk.Bech32PrefixConsAddr),
+	)
+
+	// Mint Keeper.
+	f.mintkeeper = mintkeeper.NewKeeper(
+		encCfg.Codec, runtime.NewKVStoreService(keys[minttypes.StoreKey]),
+		f.stakingKeeper, f.accountkeeper, f.bankkeeper,
+		authtypes.FeeCollectorName, f.govModAddr,
+	)
+}

x/dwn/keeper/msg_server.go

@@ -0,0 +1,36 @@
+package keeper
+
+import (
+	"context"
+
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+
+	"cosmossdk.io/errors"
+	"github.com/onsonr/sonr/x/dwn/types"
+)
+
+type msgServer struct {
+	k Keeper
+}
+
+var _ types.MsgServer = msgServer{}
+
+// NewMsgServerImpl returns an implementation of the module MsgServer interface.
+func NewMsgServerImpl(keeper Keeper) types.MsgServer {
+	return &msgServer{k: keeper}
+}
+
+func (ms msgServer) UpdateParams(ctx context.Context, msg *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) {
+	if ms.k.authority != msg.Authority {
+		return nil, errors.Wrapf(govtypes.ErrInvalidSigner, "invalid authority; expected %s, got %s", ms.k.authority, msg.Authority)
+	}
+
+	return nil, ms.k.Params.Set(ctx, msg.Params)
+}
+
+// Initialize implements types.MsgServer.
+func (ms msgServer) Initialize(ctx context.Context, msg *types.MsgInitialize) (*types.MsgInitializeResponse, error) {
+	// ctx := sdk.UnwrapSDKContext(goCtx)
+	panic("Initialize is unimplemented")
+	return &types.MsgInitializeResponse{}, nil
+}

x/dwn/keeper/msg_server_test.go

@@ -0,0 +1,56 @@
+package keeper_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/onsonr/sonr/x/dwn/types"
+)
+
+func TestParams(t *testing.T) {
+	f := SetupTest(t)
+	require := require.New(t)
+
+	testCases := []struct {
+		name    string
+		request *types.MsgUpdateParams
+		err     bool
+	}{
+		{
+			name: "fail; invalid authority",
+			request: &types.MsgUpdateParams{
+				Authority: f.addrs[0].String(),
+				Params:    types.DefaultParams(),
+			},
+			err: true,
+		},
+		{
+			name: "success",
+			request: &types.MsgUpdateParams{
+				Authority: f.govModAddr,
+				Params:    types.DefaultParams(),
+			},
+			err: false,
+		},
+	}
+
+	for _, tc := range testCases {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			_, err := f.msgServer.UpdateParams(f.ctx, tc.request)
+
+			if tc.err {
+				require.Error(err)
+			} else {
+				require.NoError(err)
+
+				r, err := f.queryServer.Params(f.ctx, &types.QueryParamsRequest{})
+				require.NoError(err)
+
+				require.EqualValues(&tc.request.Params, r.Params)
+			}
+
+		})
+	}
+}

x/dwn/keeper/orm_test.go

@@ -0,0 +1,31 @@
+package keeper_test
+
+import (
+	"testing"
+
+	apiv1 "github.com/onsonr/sonr/api/dwn/v1"
+	"github.com/stretchr/testify/require"
+)
+
+func TestORM(t *testing.T) {
+	f := SetupTest(t)
+
+	dt := f.k.OrmDB.ExampleDataTable()
+	acc := []byte("test_acc")
+	amt := uint64(7)
+
+	err := dt.Insert(f.ctx, &apiv1.ExampleData{
+		Account: acc,
+		Amount:  amt,
+	})
+	require.NoError(t, err)
+
+	d, err := dt.Has(f.ctx, []byte("test_acc"))
+	require.NoError(t, err)
+	require.True(t, d)
+
+	res, err := dt.Get(f.ctx, []byte("test_acc"))
+	require.NoError(t, err)
+	require.NotNil(t, res)
+	require.EqualValues(t, amt, res.Amount)
+}

x/dwn/keeper/query_server.go

@@ -0,0 +1,51 @@
+package keeper
+
+import (
+	"context"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/onsonr/sonr/x/dwn/types"
+)
+
+var _ types.QueryServer = Querier{}
+
+type Querier struct {
+	Keeper
+}
+
+func NewQuerier(keeper Keeper) Querier {
+	return Querier{Keeper: keeper}
+}
+
+func (k Querier) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) {
+	ctx := sdk.UnwrapSDKContext(c)
+
+	p, err := k.Keeper.Params.Get(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.QueryParamsResponse{Params: &p}, nil
+}
+
+// Schema implements types.QueryServer.
+func (k Querier) Schema(goCtx context.Context, req *types.QuerySchemaRequest) (*types.QuerySchemaResponse, error) {
+	// ctx := sdk.UnwrapSDKContext(goCtx)
+	panic("Schema is unimplemented")
+	return &types.QuerySchemaResponse{}, nil
+}
+
+// Allocate implements types.QueryServer.
+func (k Querier) Allocate(goCtx context.Context, req *types.QueryAllocateRequest) (*types.QueryAllocateResponse, error) {
+	// ctx := sdk.UnwrapSDKContext(goCtx)
+	panic("Allocate is unimplemented")
+	return &types.QueryAllocateResponse{}, nil
+}
+
+// Sync implements types.QueryServer.
+func (k Querier) Sync(goCtx context.Context, req *types.QuerySyncRequest) (*types.QuerySyncResponse, error) {
+	// ctx := sdk.UnwrapSDKContext(goCtx)
+	panic("Sync is unimplemented")
+	return &types.QuerySyncResponse{}, nil
+}