Remove default options from ResolveStorageOptions

log.go

@@ -50,11 +50,9 @@ type StorageOptions struct {
 }
 
 // ResolveStorageOptions turns a variadic array of storage options into a StorageOptions instance.
-func ResolveStorageOptions(defaults *StorageOptions, opts ...func(*StorageOptions)) *StorageOptions {
-	if defaults == nil {
-		defaults = &StorageOptions{
-			BatchMaxSize: DefaultBatchMaxSize,
-		}
+func ResolveStorageOptions(opts ...func(*StorageOptions)) *StorageOptions {
+	defaults := &StorageOptions{
+		BatchMaxSize: DefaultBatchMaxSize,
 	}
 	for _, opt := range opts {
 		opt(defaults)

storage/gcp/gcp.go

@@ -110,7 +110,7 @@ type Config struct {
 
 // New creates a new instance of the GCP based Storage.
 func New(ctx context.Context, cfg Config, opts ...func(*tessera.StorageOptions)) (*Storage, error) {
-	opt := tessera.ResolveStorageOptions(nil, opts...)
+	opt := tessera.ResolveStorageOptions(opts...)
 	if opt.PushbackMaxOutstanding == 0 {
 		opt.PushbackMaxOutstanding = DefaultPushbackMaxOutstanding
 	}

storage/mysql/mysql.go

@@ -59,10 +59,7 @@ type Storage struct {
 // New creates a new instance of the MySQL-based Storage.
 // Note that `tessera.WithCheckpointSignerVerifier()` is mandatory in the `opts` argument.
 func New(ctx context.Context, db *sql.DB, opts ...func(*tessera.StorageOptions)) (*Storage, error) {
-	opt := tessera.ResolveStorageOptions(&tessera.StorageOptions{
-		BatchMaxAge:  defaultQueueMaxAge,
-		BatchMaxSize: defaultBatchMaxSize,
-	}, opts...)
+	opt := tessera.ResolveStorageOptions(opts...)
 	s := &Storage{
 		db:              db,
 		newCheckpoint:   opt.NewCP,

storage/posix/files.go

@@ -63,7 +63,7 @@ func New(ctx context.Context, path string, curTree func() (uint64, []byte, error
 	if err != nil {
 		panic(err)
 	}
-	opt := tessera.ResolveStorageOptions(nil, opts...)
+	opt := tessera.ResolveStorageOptions(opts...)
 
 	r := &Storage{
 		path:    path,