Moved all packages from /pkg directory to the root directory. Deleted /pkg directory. Pass keyspace functions to raft package instead of an EchoVault instance. This removes dependency on the echovault pakage from the raft package.

cmd/main.go

@@ -16,9 +16,9 @@ package main
 
 import (
 	"context"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/echovault"
 	"log"
 	"os"
 	"os/signal"

echovault/api_admin.go

@@ -17,7 +17,7 @@ package echovault
 import (
 	"fmt"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/types"
+	"github.com/echovault/echovault/types"
 	"strings"
 )
 

echovault/echovault.go

@@ -20,6 +20,7 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/aof"
 	"github.com/echovault/echovault/internal/clock"
@@ -38,7 +39,6 @@ import (
 	str "github.com/echovault/echovault/internal/modules/string"
 	"github.com/echovault/echovault/internal/raft"
 	"github.com/echovault/echovault/internal/snapshot"
-	"github.com/echovault/echovault/pkg/constants"
 	"io"
 	"log"
 	"net"
@@ -185,6 +185,10 @@ func NewEchoVault(options ...func(echovault *EchoVault)) (*EchoVault, error) {
 			Config:                echovault.config,
 			EchoVault:             echovault,
 			GetCommand:            echovault.getCommand,
+			CreateKeyAndLock:      echovault.CreateKeyAndLock,
+			SetValue:              echovault.SetValue,
+			SetExpiry:             echovault.SetExpiry,
+			KeyUnlock:             echovault.KeyUnlock,
 			DeleteKey:             echovault.DeleteKey,
 			StartSnapshot:         echovault.startSnapshot,
 			FinishSnapshot:        echovault.finishSnapshot,

echovault/keyspace.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"log"
 	"math/rand"
 	"runtime"

echovault/modules.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"net"
 	"strings"
 )

internal/config/config.go

@@ -19,8 +19,8 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"log"
 	"os"
 	"path"

internal/config/default.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/echovault/echovault/pkg/constants"
+	"github.com/echovault/echovault/constants"
 	"time"
 )
 

internal/modules/acl/acl.go

@@ -20,9 +20,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/constants"
 	"github.com/gobwas/glob"
 	"gopkg.in/yaml.v3"
 	"log"

internal/modules/acl/commands.go

@@ -18,8 +18,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"gopkg.in/yaml.v3"
 	"log"
 	"os"

internal/modules/admin/commands.go

@@ -17,8 +17,8 @@ package admin
 import (
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"github.com/gobwas/glob"
 	"slices"
 	"strings"

internal/modules/connection/commands.go

@@ -17,8 +17,8 @@ package connection
 import (
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 )
 
 func handlePing(params internal.HandlerFuncParams) ([]byte, error) {

internal/modules/generic/commands.go

@@ -17,8 +17,8 @@ package generic
 import (
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"log"
 	"strconv"
 	"strings"

internal/modules/generic/key_funcs.go

@@ -16,8 +16,8 @@ package generic
 
 import (
 	"errors"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 )
 
 func setKeyFunc(cmd []string) (internal.AccessKeys, error) {

internal/modules/hash/commands.go

@@ -17,8 +17,8 @@ package hash
 import (
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"math/rand"
 	"slices"
 	"strconv"

internal/modules/hash/key_funcs.go

@@ -16,8 +16,8 @@ package hash
 
 import (
 	"errors"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 )
 
 func hsetKeyFunc(cmd []string) (internal.AccessKeys, error) {

internal/modules/list/commands.go

@@ -17,8 +17,8 @@ package list
 import (
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"math"
 	"slices"
 	"strings"

internal/modules/list/key_funcs.go

@@ -16,8 +16,8 @@ package list
 
 import (
 	"errors"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 )
 
 func lpushKeyFunc(cmd []string) (internal.AccessKeys, error) {

internal/modules/pubsub/commands.go

@@ -17,8 +17,8 @@ package pubsub
 import (
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"strings"
 )
 

internal/modules/set/commands.go

@@ -17,8 +17,8 @@ package set
 import (
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"slices"
 	"strings"
 )

internal/modules/set/key_funcs.go

@@ -16,8 +16,8 @@ package set
 
 import (
 	"errors"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"slices"
 	"strings"
 )

internal/modules/sorted_set/commands.go

@@ -18,8 +18,8 @@ import (
 	"cmp"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"math"
 	"slices"
 	"strconv"

internal/modules/sorted_set/key_funcs.go

@@ -16,8 +16,8 @@ package sorted_set
 
 import (
 	"errors"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 	"slices"
 	"strings"
 )

internal/modules/string/commands.go

@@ -17,8 +17,8 @@ package str
 import (
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 )
 
 func handleSetRange(params internal.HandlerFuncParams) ([]byte, error) {

internal/modules/string/key_funcs.go

@@ -16,8 +16,8 @@ package str
 
 import (
 	"errors"
+	"github.com/echovault/echovault/constants"
 	"github.com/echovault/echovault/internal"
-	"github.com/echovault/echovault/pkg/constants"
 )
 
 func setRangeKeyFunc(cmd []string) (internal.AccessKeys, error) {

internal/raft/fsm.go

@@ -20,19 +20,22 @@ import (
 	"fmt"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/types"
 	"github.com/hashicorp/raft"
 	"io"
 	"log"
 	"net"
 	"strings"
+	"time"
 )
 
 type FSMOpts struct {
 	Config                config.Config
-	EchoVault             types.EchoVault
 	GetState              func() map[string]internal.KeyData
 	GetCommand            func(command string) (internal.Command, error)
+	CreateKeyAndLock      func(ctx context.Context, key string) (bool, error)
+	SetValue              func(ctx context.Context, key string, value interface{}) error
+	SetExpiry             func(ctx context.Context, key string, expire time.Time, touch bool)
+	KeyUnlock             func(ctx context.Context, key string)
 	DeleteKey             func(ctx context.Context, key string) error
 	StartSnapshot         func()
 	FinishSnapshot        func()
@@ -154,14 +157,14 @@ func (fsm *FSM) Restore(snapshot io.ReadCloser) error {
 	// Set state
 	ctx := context.Background()
 	for k, v := range internal.FilterExpiredKeys(data.State) {
-		if _, err = fsm.options.EchoVault.CreateKeyAndLock(ctx, k); err != nil {
+		if _, err = fsm.options.CreateKeyAndLock(ctx, k); err != nil {
 			log.Fatal(err)
 		}
-		if err = fsm.options.EchoVault.SetValue(ctx, k, v.Value); err != nil {
+		if err = fsm.options.SetValue(ctx, k, v.Value); err != nil {
 			log.Fatal(err)
 		}
-		fsm.options.EchoVault.SetExpiry(ctx, k, v.ExpireAt, false)
-		fsm.options.EchoVault.KeyUnlock(ctx, k)
+		fsm.options.SetExpiry(ctx, k, v.ExpireAt, false)
+		fsm.options.KeyUnlock(ctx, k)
 	}
 	// Set latest snapshot milliseconds
 	fsm.options.SetLatestSnapshotTime(data.LatestSnapshotMilliseconds)

internal/raft/raft.go

@@ -27,7 +27,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/echovault/echovault/pkg/types"
+	"github.com/echovault/echovault/types"
 	"github.com/hashicorp/raft"
 	raftboltdb "github.com/hashicorp/raft-boltdb"
 )
@@ -35,6 +35,10 @@ import (
 type Opts struct {
 	Config                config.Config
 	EchoVault             types.EchoVault
+	CreateKeyAndLock      func(ctx context.Context, key string) (bool, error)
+	SetValue              func(ctx context.Context, key string, value interface{}) error
+	SetExpiry             func(ctx context.Context, key string, expire time.Time, touch bool)
+	KeyUnlock             func(ctx context.Context, key string)
 	GetState              func() map[string]internal.KeyData
 	GetCommand            func(command string) (internal.Command, error)
 	DeleteKey             func(ctx context.Context, key string) error
@@ -114,9 +118,12 @@ func (r *Raft) RaftInit(ctx context.Context) {
 		raftConfig,
 		NewFSM(FSMOpts{
 			Config:                r.options.Config,
-			EchoVault:             r.options.EchoVault,
 			GetState:              r.options.GetState,
 			GetCommand:            r.options.GetCommand,
+			CreateKeyAndLock:      r.options.CreateKeyAndLock,
+			SetValue:              r.options.SetValue,
+			SetExpiry:             r.options.SetExpiry,
+			KeyUnlock:             r.options.KeyUnlock,
 			DeleteKey:             r.options.DeleteKey,
 			StartSnapshot:         r.options.StartSnapshot,
 			FinishSnapshot:        r.options.FinishSnapshot,

internal/utils.go

@@ -20,7 +20,7 @@ import (
 	"cmp"
 	"errors"
 	"fmt"
-	"github.com/echovault/echovault/pkg/constants"
+	"github.com/echovault/echovault/constants"
 	"io"
 	"log"
 	"math/big"

pkg/config/config.go

@@ -1,11 +0,0 @@
-package config
-
-import (
-	"github.com/echovault/echovault/internal/config"
-)
-
-// DefaultConfig returns the default configuration.
-// This should be used when using EchoVault as an embedded library.
-func DefaultConfig() config.Config {
-	return config.DefaultConfig()
-}

test/modules/acl/commands_test.go

@@ -17,10 +17,10 @@ package acl
 import (
 	"crypto/sha256"
 	"fmt"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal/config"
 	"github.com/echovault/echovault/internal/modules/acl"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"net"
 	"reflect"

test/modules/admin/commands_test.go

@@ -18,10 +18,10 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"net"
 	"reflect"

test/modules/connection/commands_test.go

@@ -18,10 +18,10 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"net"
 	"reflect"

test/modules/generic/api_test.go

@@ -16,10 +16,10 @@ package generic
 
 import (
 	"context"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/clock"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/echovault"
 	"reflect"
 	"slices"
 	"strings"

test/modules/generic/commands_test.go

@@ -19,11 +19,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/clock"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"net"
 	"reflect"

test/modules/hash/api_test.go

@@ -16,8 +16,8 @@ package hash
 
 import (
 	"context"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/echovault"
 	"reflect"
 	"slices"
 	"testing"

test/modules/hash/commands_test.go

@@ -19,10 +19,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"net"
 	"reflect"

test/modules/list/api_test.go

@@ -16,8 +16,8 @@ package list
 
 import (
 	"context"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/echovault"
 	"reflect"
 	"testing"
 )

test/modules/list/commands_test.go

@@ -19,10 +19,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"net"
 	"reflect"

test/modules/pubsub/commands_test.go

@@ -18,11 +18,11 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
 	"github.com/echovault/echovault/internal/modules/pubsub"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"net"
 	"reflect"

test/modules/set/api_test.go

@@ -16,9 +16,9 @@ package set
 
 import (
 	"context"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal/config"
 	"github.com/echovault/echovault/internal/modules/set"
-	"github.com/echovault/echovault/pkg/echovault"
 	"reflect"
 	"slices"
 	"testing"

test/modules/set/commands_test.go

@@ -19,11 +19,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
 	"github.com/echovault/echovault/internal/modules/set"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"net"
 	"reflect"

test/modules/sorted_set/api_test.go

@@ -16,10 +16,10 @@ package sorted_set
 
 import (
 	"context"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
 	ss "github.com/echovault/echovault/internal/modules/sorted_set"
-	"github.com/echovault/echovault/pkg/echovault"
 	"math"
 	"reflect"
 	"strconv"

test/modules/sorted_set/commands_test.go

@@ -19,11 +19,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
 	"github.com/echovault/echovault/internal/modules/sorted_set"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"math"
 	"net"

test/modules/string/api_test.go

@@ -16,8 +16,8 @@ package str
 
 import (
 	"context"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/echovault"
 	"testing"
 )
 

test/modules/string/commands_test.go

@@ -19,10 +19,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/constants"
+	"github.com/echovault/echovault/echovault"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/echovault"
 	"github.com/tidwall/resp"
 	"net"
 	"reflect"