[Merged by Bors] - Clean up all files upon stop smeshing

activation/activation.go

@@ -7,6 +7,7 @@
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"io/fs"
 	"os"
 	"sync"
 	"time"
@@ -251,6 +252,19 @@
 			b.log.With().Error("failed to delete post files", log.Err(err))
 			return err
 		}
+		if err := discardBuilderState(b.nipostBuilder.DataDir()); err != nil && !errors.Is(err, fs.ErrNotExist) {
+			b.log.With().Error("failed to delete builder state", log.Err(err))
+			return err
+		}
+		if err := discardNipostChallenge(b.nipostBuilder.DataDir()); err != nil && !errors.Is(err, fs.ErrNotExist) {
+			b.log.With().Error("failed to delete nipost challenge", log.Err(err))
+			return err
+		}
+		if err := discardPost(b.nipostBuilder.DataDir()); err != nil && !errors.Is(err, fs.ErrNotExist) {
+			b.log.With().Error("failed to delete post", log.Err(err))
+			return err
+		}
+
 		return nil
 	default:
 		return fmt.Errorf("failed to stop post data creation session: %w", err)

activation/activation_test.go

@@ -324,6 +324,45 @@ func TestBuilder_RestartSmeshing(t *testing.T) {
 	})
 }
 
+func TestBuilder_StopSmeshing_Delete(t *testing.T) {
+	tab := newTestBuilder(t)
+
+	tab.mpost.EXPECT().PrepareInitializer(gomock.Any(), gomock.Any()).AnyTimes()
+	tab.mpost.EXPECT().StartSession(gomock.Any()).DoAndReturn(func(ctx context.Context) error {
+		// wait for stop to be called
+		<-ctx.Done()
+		return ctx.Err()
+	}).AnyTimes()
+
+	// Create state files
+	require.NoError(t, saveBuilderState(tab.nipostBuilder.DataDir(), &types.NIPostBuilderState{}))
+	require.NoError(t, savePost(tab.nipostBuilder.DataDir(), &types.Post{}))
+	require.NoError(t, SaveNipostChallenge(tab.nipostBuilder.DataDir(), &types.NIPostChallenge{}))
+	files, err := os.ReadDir(tab.nipostBuilder.DataDir())
+	require.NoError(t, err)
+	require.Len(t, files, 3) // 3 state files created
+
+	require.NoError(t, tab.StartSmeshing(types.Address{}, PostSetupOpts{}))
+	require.NoError(t, tab.StopSmeshing(false))
+	files, err = os.ReadDir(tab.nipostBuilder.DataDir())
+	require.NoError(t, err)
+	require.Len(t, files, 3) // state files still present
+
+	require.NoError(t, tab.StartSmeshing(types.Address{}, PostSetupOpts{}))
+	tab.mpost.EXPECT().Reset().Return(nil)
+	require.NoError(t, tab.StopSmeshing(true))
+	files, err = os.ReadDir(tab.nipostBuilder.DataDir())
+	require.NoError(t, err)
+	require.Len(t, files, 0) // state files deleted
+
+	require.NoError(t, tab.StartSmeshing(types.Address{}, PostSetupOpts{}))
+	tab.mpost.EXPECT().Reset().Return(nil)
+	require.NoError(t, tab.StopSmeshing(true)) // no-op
+	files, err = os.ReadDir(tab.nipostBuilder.DataDir())
+	require.NoError(t, err)
+	require.Len(t, files, 0) // state files still deleted
+}
+
 func TestBuilder_StoppingSmeshingBefore_Initialized(t *testing.T) {
 	tab := newTestBuilder(t)
 	tab.mpost.EXPECT().PrepareInitializer(gomock.Any(), gomock.Any()).AnyTimes()

activation/nipost_state.go

@@ -153,6 +153,14 @@ func loadBuilderState(dir string) (*types.NIPostBuilderState, error) {
 	return &state, nil
 }
 
+func discardBuilderState(dir string) error {
+	filename := filepath.Join(dir, builderFilename)
+	if err := os.Remove(filename); err != nil {
+		return fmt.Errorf("discarding nipost builder state: %w", err)
+	}
+	return nil
+}
+
 func savePost(dir string, post *types.Post) error {
 	if err := save(filepath.Join(dir, postFilename), post); err != nil {
 		return fmt.Errorf("saving post: %w", err)
@@ -167,3 +175,11 @@ func loadPost(dir string) (*types.Post, error) {
 	}
 	return &post, nil
 }
+
+func discardPost(dir string) error {
+	filename := filepath.Join(dir, postFilename)
+	if err := os.Remove(filename); err != nil {
+		return fmt.Errorf("discarding post: %w", err)
+	}
+	return nil
+}