set snapshot removal and list to not depend on bootstrapped network

Author: felipemadero

local/network.go

@@ -135,7 +135,7 @@ var (
 	deprecatedFlagsSupportBytes []byte
 	deprecatedFlagsSupport      []deprecatedFlagEsp
 	// snapshots directory
-	defaultSnapshotsDir string
+	DefaultSnapshotsDir string
 )
 
 // populate default network config from embedded default directory
@@ -149,14 +149,14 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
-	defaultSnapshotsDir = filepath.Join(usr.HomeDir, snapshotsRelPath)
+	DefaultSnapshotsDir = filepath.Join(usr.HomeDir, snapshotsRelPath)
 }
 
 // NewNetwork returns a new network that uses the given log.
 // Files (e.g. logs, databases) default to being written at directory [rootDir].
 // If there isn't a directory at [dir] one will be created.
 // If len([dir]) == 0, files will be written underneath a new temporary directory.
-// Snapshots are saved to snapshotsDir, defaults to defaultSnapshotsDir if not given
+// Snapshots are saved to snapshotsDir, defaults to DefaultSnapshotsDir if not given
 func NewNetwork(
 	log logging.Logger,
 	networkConfig network.Config,
@@ -214,7 +214,7 @@ func newNetwork(
 		}
 	}
 	if snapshotsDir == "" {
-		snapshotsDir = defaultSnapshotsDir
+		snapshotsDir = DefaultSnapshotsDir
 	}
 	// create the snapshots dir if not present
 	err = os.MkdirAll(snapshotsDir, os.ModePerm)

local/snapshot.go

@@ -334,7 +334,16 @@ func (ln *localNetwork) loadSnapshot(
 
 // Remove network snapshot
 func (ln *localNetwork) RemoveSnapshot(snapshotName string) error {
-	snapshotDir := filepath.Join(ln.snapshotsDir, snapshotPrefix+snapshotName)
+	return RemoveSnapshot(ln.snapshotsDir, snapshotName)
+}
+
+// Get network snapshots
+func (ln *localNetwork) GetSnapshotNames() ([]string, error) {
+	return GetSnapshotNames(ln.snapshotsDir)
+}
+
+func RemoveSnapshot(snapshotsDir string, snapshotName string) error {
+	snapshotDir := filepath.Join(snapshotsDir, snapshotPrefix+snapshotName)
 	_, err := os.Stat(snapshotDir)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
@@ -349,17 +358,16 @@ func (ln *localNetwork) RemoveSnapshot(snapshotName string) error {
 	return nil
 }
 
-// Get network snapshots
-func (ln *localNetwork) GetSnapshotNames() ([]string, error) {
-	_, err := os.Stat(ln.snapshotsDir)
+func GetSnapshotNames(snapshotsDir string) ([]string, error) {
+	_, err := os.Stat(snapshotsDir)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
-			return nil, fmt.Errorf("snapshots dir %q does not exists", ln.snapshotsDir)
+			return nil, fmt.Errorf("snapshots dir %q does not exists", snapshotsDir)
 		} else {
-			return nil, fmt.Errorf("failure accessing snapshots dir %q: %w", ln.snapshotsDir, err)
+			return nil, fmt.Errorf("failure accessing snapshots dir %q: %w", snapshotsDir, err)
 		}
 	}
-	matches, err := filepath.Glob(filepath.Join(ln.snapshotsDir, snapshotPrefix+"*"))
+	matches, err := filepath.Glob(filepath.Join(snapshotsDir, snapshotPrefix+"*"))
 	if err != nil {
 		return nil, err
 	}

server/server.go

@@ -21,6 +21,7 @@ import (
 
 	"go.uber.org/multierr"
 
+	"github.com/ava-labs/avalanche-network-runner/local"
 	"github.com/ava-labs/avalanche-network-runner/network"
 	"github.com/ava-labs/avalanche-network-runner/network/node"
 	"github.com/ava-labs/avalanche-network-runner/rpcpb"
@@ -133,6 +134,10 @@ func New(cfg Config, log logging.Logger) (Server, error) {
 		return nil, err
 	}
 
+	if cfg.SnapshotsDir == "" {
+		cfg.SnapshotsDir = local.DefaultSnapshotsDir
+	}
+
 	s := &server{
 		cfg:        cfg,
 		log:        log,
@@ -1412,11 +1417,7 @@ func (s *server) RemoveSnapshot(_ context.Context, req *rpcpb.RemoveSnapshotRequ
 
 	s.log.Info("RemoveSnapshot", zap.String("snapshot-name", req.SnapshotName))
 
-	if s.network == nil {
-		return nil, ErrNotBootstrapped
-	}
-
-	if err := s.network.nw.RemoveSnapshot(req.SnapshotName); err != nil {
+	if err := local.RemoveSnapshot(s.cfg.SnapshotsDir, req.SnapshotName); err != nil {
 		s.log.Warn("snapshot remove failed to complete", zap.Error(err))
 		return nil, err
 	}
@@ -1429,11 +1430,7 @@ func (s *server) GetSnapshotNames(context.Context, *rpcpb.GetSnapshotNamesReques
 
 	s.log.Info("GetSnapshotNames")
 
-	if s.network == nil {
-		return nil, ErrNotBootstrapped
-	}
-
-	snapshotNames, err := s.network.nw.GetSnapshotNames()
+	snapshotNames, err := local.GetSnapshotNames(s.cfg.SnapshotsDir)
 	if err != nil {
 		return nil, err
 	}