fix: replay logs when importing account

Signed-off-by: clegirar <clemntgirard@gmail.com>
berty · Jul 6, 2021 · 61b5cba · 61b5cba
1 parent 36304f2
commit 61b5cba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/go/pkg/bertymessenger/db.go b/go/pkg/bertymessenger/db.go
@@ -27,6 +27,8 @@ type dbWrapper struct {
 	inTx       bool
 }
 
+func noopReplayer(_ *dbWrapper) error { return nil }
+
 func (d *dbWrapper) logStep(text string, muts ...tyber.StepMutator) {
 	tyber.LogStep(d.ctx, d.log, text, muts...)
 }

diff --git a/go/pkg/bertymessenger/db_test.go b/go/pkg/bertymessenger/db_test.go
@@ -19,8 +19,6 @@ import (
 	"berty.tech/berty/v2/go/pkg/protocoltypes"
 )
 
-func noopReplayer(_ *dbWrapper) error { return nil }
-
 type getInMemoryTestDBOpts int32
 
 const (

diff --git a/go/pkg/bertymessenger/service.go b/go/pkg/bertymessenger/service.go
@@ -161,8 +161,8 @@ func New(client protocoltypes.ProtocolServiceClient, opts *Opts) (_ Service, err
 			return nil, errcode.ErrDBWrite.Wrap(fmt.Errorf("unable to drop database schema: %w", err))
 		}
 
-		if err := db.db.AutoMigrate(getDBModels()...); err != nil {
-			return nil, errcode.ErrDBWrite.Wrap(fmt.Errorf("unable to create database schema: %w", err))
+		if err := db.getUpdatedDB(getDBModels(), noopReplayer, l); err != nil {
+			return nil, err
 		}
 
 		if err := replayLogsToDB(ctx, client, db); err != nil {