refactor: move Pkl module definitions to dedicated package

This commit is contained in:
Prad Nukala
2024-10-07 20:35:40 -04:00
parent ddf745f39a
commit e926e5b9d6
18 changed files with 59 additions and 50 deletions
+3 -3
View File
@@ -5,7 +5,7 @@ import (
"time"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/onsonr/sonr/pkg/dwn"
dwngen "github.com/onsonr/sonr/pkg/dwn/gen"
"github.com/onsonr/sonr/x/vault/types"
)
@@ -35,13 +35,13 @@ func (k Keeper) AssembleVault(ctx sdk.Context) (string, int64, error) {
}
// currentSchema returns the current schema
func (k Keeper) CurrentSchema(ctx sdk.Context) (*dwn.Schema, error) {
func (k Keeper) CurrentSchema(ctx sdk.Context) (*dwngen.Schema, error) {
p, err := k.Params.Get(ctx)
if err != nil {
return nil, err
}
schema := p.Schema
return &dwn.Schema{
return &dwngen.Schema{
Version: int(schema.Version),
Account: schema.Account,
Asset: schema.Asset,
+9 -8
View File
@@ -4,14 +4,15 @@ import (
"github.com/ipfs/boxo/files"
"github.com/onsonr/sonr/pkg/dwn"
dwngen "github.com/onsonr/sonr/pkg/dwn/gen"
)
type Vault struct {
FS files.Node
}
func NewVault(keyshareJSON string, adddress string, chainID string, schema *dwn.Schema) (*Vault, error) {
dwnCfg := &dwn.Config{
func NewVault(keyshareJSON string, adddress string, chainID string, schema *dwngen.Schema) (*Vault, error) {
dwnCfg := &dwngen.Config{
Motr: createMotrConfig(keyshareJSON, adddress, "sonr.id"),
Ipfs: defaultIPFSConfig(),
Sonr: defaultSonrConfig(chainID),
@@ -26,23 +27,23 @@ func NewVault(keyshareJSON string, adddress string, chainID string, schema *dwn.
}, nil
}
func createMotrConfig(keyshareJSON string, adddress string, origin string) *dwn.Motr {
return &dwn.Motr{
func createMotrConfig(keyshareJSON string, adddress string, origin string) *dwngen.Motr {
return &dwngen.Motr{
Keyshare: keyshareJSON,
Address: adddress,
Origin: origin,
}
}
func defaultIPFSConfig() *dwn.IPFS {
return &dwn.IPFS{
func defaultIPFSConfig() *dwngen.IPFS {
return &dwngen.IPFS{
ApiUrl: "https://api.sonr-ipfs.land",
GatewayUrl: "https://ipfs.sonr.land",
}
}
func defaultSonrConfig(chainID string) *dwn.Sonr {
return &dwn.Sonr{
func defaultSonrConfig(chainID string) *dwngen.Sonr {
return &dwngen.Sonr{
ApiUrl: "https://api.sonr.land",
GrpcUrl: "https://grpc.sonr.land",
RpcUrl: "https://rpc.sonr.land",