Split poet into registration and worker services

db/migrate.go

@@ -42,20 +42,20 @@
 	}
 	defer targetDb.Close()
 
-	trans, err := targetDb.OpenTransaction()
+	tx, err := targetDb.OpenTransaction()
 	if err != nil {
 		return fmt.Errorf("opening new DB transaction: %w", err)
 	}
 	iter := oldDb.NewIterator(nil, nil)
 	defer iter.Release()
 	for iter.Next() {
-		if err := trans.Put(iter.Key(), iter.Value(), nil); err != nil {
-			trans.Discard()
+		if err := tx.Put(iter.Key(), iter.Value(), nil); err != nil {
+			tx.Discard()
 			return fmt.Errorf("migrating key %X: %w", iter.Key(), err)
 		}
 	}
 	iter.Release()
-	if err := trans.Commit(); err != nil {
+	if err := tx.Commit(); err != nil {
 		return fmt.Errorf("committing DB transaction: %w", err)
 	}
 

db/migrate_test.go

@@ -3,6 +3,7 @@ package db_test
 import (
 	"context"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -75,7 +76,7 @@ func TestSkipMigrateInPlace(t *testing.T) {
 }
 
 func TestSkipMigrateSrcDoesntExist(t *testing.T) {
-	require.NoError(t, db.Migrate(context.Background(), t.TempDir(), "i-dont-exist"))
+	require.NoError(t, db.Migrate(context.Background(), t.TempDir(), filepath.Join(t.TempDir(), "i-dont-exist")))
 }
 
 func TestDontMigrateIfTargetExists(t *testing.T) {

migrations/00_dbdir.go

@@ -9,12 +9,12 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/spacemeshos/poet/config"
 	"github.com/spacemeshos/poet/db"
 	"github.com/spacemeshos/poet/logging"
+	"github.com/spacemeshos/poet/server"
 )
 
-func migrateDbDir(ctx context.Context, cfg *config.Config) error {
+func migrateDbDir(ctx context.Context, cfg *server.Config) error {
 	if err := migrateProofsDb(ctx, cfg); err != nil {
 		return fmt.Errorf("migrating proofs DB: %w", err)
 	}
@@ -25,7 +25,7 @@ func migrateDbDir(ctx context.Context, cfg *config.Config) error {
 	return nil
 }
 
-func migrateRoundsDbs(ctx context.Context, cfg *config.Config) error {
+func migrateRoundsDbs(ctx context.Context, cfg *server.Config) error {
 	roundsDataDir := filepath.Join(cfg.DataDir, "rounds")
 	// check if dir exists
 	if _, err := os.Stat(roundsDataDir); os.IsNotExist(err) {
@@ -57,7 +57,7 @@ func migrateRoundsDbs(ctx context.Context, cfg *config.Config) error {
 	return nil
 }
 
-func migrateProofsDb(ctx context.Context, cfg *config.Config) error {
+func migrateProofsDb(ctx context.Context, cfg *server.Config) error {
 	proofsDbPath := filepath.Join(cfg.DbDir, "proofs")
 	oldProofsDbPath := filepath.Join(cfg.DataDir, "proofs")
 	if err := db.Migrate(ctx, proofsDbPath, oldProofsDbPath); err != nil {

migrations/00_dbdir_test.go

@@ -9,12 +9,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/syndtr/goleveldb/leveldb"
 
-	"github.com/spacemeshos/poet/config"
+	"github.com/spacemeshos/poet/server"
 )
 
 func TestMigrateRoundsDb(t *testing.T) {
 	// Prepare
-	cfg := config.Config{
+	cfg := server.Config{
 		DataDir: t.TempDir(),
 		DbDir:   t.TempDir(),
 	}
@@ -50,7 +50,7 @@ func TestMigrateRoundsDb(t *testing.T) {
 }
 
 func TestMigrateRoundsDb_NothingToMigrate(t *testing.T) {
-	cfg := config.Config{
+	cfg := server.Config{
 		DataDir: t.TempDir(),
 		DbDir:   t.TempDir(),
 	}

migrations/migrations.go

@@ -3,11 +3,11 @@ package migrations
 import (
 	"context"
 
-	"github.com/spacemeshos/poet/config"
 	"github.com/spacemeshos/poet/logging"
+	"github.com/spacemeshos/poet/server"
 )
 
-func Migrate(ctx context.Context, cfg *config.Config) error {
+func Migrate(ctx context.Context, cfg *server.Config) error {
 	ctx = logging.NewContext(ctx, logging.FromContext(ctx).Named("migrations"))
 	if err := migrateDbDir(ctx, cfg); err != nil {
 		return err

migrations/migrations_test.go

@@ -6,12 +6,12 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/spacemeshos/poet/config"
 	"github.com/spacemeshos/poet/migrations"
+	"github.com/spacemeshos/poet/server"
 )
 
 func TestMigrate(t *testing.T) {
-	cfg := config.DefaultConfig()
+	cfg := server.DefaultConfig()
 	cfg.PoetDir = t.TempDir()
 	cfg.DataDir = t.TempDir()
 	cfg.DbDir = t.TempDir()

poet.go

@@ -18,7 +18,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"go.uber.org/zap"
 
-	"github.com/spacemeshos/poet/config"
 	"github.com/spacemeshos/poet/logging"
 	"github.com/spacemeshos/poet/migrations"
 	"github.com/spacemeshos/poet/server"
@@ -33,26 +32,26 @@ var version = "unknown"
 // os.Exit() is called.
 func poetMain() (err error) {
 	// Start with a default Config with sane settings
-	cfg := config.DefaultConfig()
+	cfg := server.DefaultConfig()
 	// Pre-parse the command line to check for an alternative Config file
-	cfg, err = config.ParseFlags(cfg)
+	cfg, err = server.ParseFlags(cfg)
 	if err != nil {
 		return err
 	}
 	// Load configuration file overwriting defaults with any specified options
 	// Parse CLI options and overwrite/add any specified options
-	cfg, err = config.ReadConfigFile(cfg)
+	cfg, err = server.ReadConfigFile(cfg)
 	if err != nil {
 		return err
 	}
 
-	cfg, err = config.SetupConfig(cfg)
+	cfg, err = server.SetupConfig(cfg)
 	if err != nil {
 		return err
 	}
 	// Finally, parse the remaining command line options again to ensure
 	// they take precedence.
-	cfg, err = config.ParseFlags(cfg)
+	cfg, err = server.ParseFlags(cfg)
 	if err != nil {
 		return err
 	}
@@ -69,9 +68,15 @@ func poetMain() (err error) {
 		logger.Info("shutdown complete")
 	}()
 
-	// Show version at startup.
-	logger.Sugar().
-		Infof("version: %s, dir: %v, datadir: %v, genesis: %v", version, cfg.PoetDir, cfg.DataDir, cfg.Service.Genesis.Time())
+	logger.Info(
+		"starting up poet",
+		zap.String("version", version),
+		zap.String("poet dir", cfg.PoetDir),
+		zap.String("datadir", cfg.DataDir),
+		zap.String("dbdir", cfg.DbDir),
+		zap.Time("genesis", cfg.Genesis.Time()),
+		zap.Object("round config", cfg.Round),
+	)
 
 	// Migrate data if needed
 	if err := migrations.Migrate(ctx, cfg); err != nil {
@@ -131,10 +136,15 @@ func poetMain() (err error) {
 	if err != nil {
 		return fmt.Errorf("failed to create server: %w", err)
 	}
+
 	if err := server.Start(ctx); err != nil {
-		return fmt.Errorf("failure in server: %w", err)
+		errClosing := server.Close()
+		return fmt.Errorf("failure in server: %w (closing: %w)", err, errClosing)
 	}
 
+	if err := server.Close(); err != nil {
+		return fmt.Errorf("failed closing server: %w", err)
+	}
 	return nil
 }
 

registration/config.go

@@ -0,0 +1,19 @@
+package registration
+
+import "time"
+
+func DefaultConfig() Config {
+	return Config{
+		MaxRoundMembers:     1 << 32,
+		SubmitFlushInterval: 100 * time.Millisecond,
+		MaxSubmitBatchSize:  1000,
+	}
+}
+
+type Config struct {
+	PowDifficulty uint `long:"pow-difficulty" description:"PoW difficulty (in the number of leading zero bits)"`
+
+	MaxRoundMembers     int           `long:"max-round-members"     description:"the maximum number of members in a round"`
+	MaxSubmitBatchSize  int           `long:"max-submit-batch-size" description:"The maximum number of challenges to submit in a single batch"`
+	SubmitFlushInterval time.Duration `long:"submit-flush-interval" description:"The interval between flushes of the submit queue"`
+}