Merge branch 'feature/stable-cadence' into bastian/verbose-log-staged…

…-update-failures
onflow · Apr 12, 2024 · 8b748b2 · 8b748b2
2 parents 70204dd + a3493b9
commit 8b748b2
Show file tree

Hide file tree

Showing 5 changed files with 496 additions and 142 deletions.
diff --git a/cmd/util/ledger/migrations/cadence.go b/cmd/util/ledger/migrations/cadence.go
@@ -326,9 +326,8 @@ func NewCadence1ContractsMigrations(
 		log,
 		rwf,
 		stagedContractsMigrationOptions,
-	).WithContractUpdateValidation()
-
-	stagedContractsMigration.RegisterContractUpdates(opts.StagedContracts)
+	).WithContractUpdateValidation().
+		WithStagedContractUpdates(opts.StagedContracts)
 
 	toAccountBasedMigration := func(migration AccountBasedMigration) ledger.Migration {
 		return NewAccountBasedMigration(

diff --git a/cmd/util/ledger/migrations/change_contract_code_migration.go b/cmd/util/ledger/migrations/change_contract_code_migration.go
@@ -267,7 +267,7 @@ func NewSystemContractsMigration(
 		options.StagedContractsMigrationOptions,
 	)
 	for _, change := range SystemContractChanges(options.ChainID, options) {
-		migration.RegisterContractChange(change)
+		migration.registerContractChange(change)
 	}
 	return migration
 }
diff --git a/cmd/util/ledger/migrations/change_contract_code_migration_test.go b/cmd/util/ledger/migrations/change_contract_code_migration_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"strings"
 	"sync"
 	"testing"
 
@@ -54,8 +55,17 @@ type logWriter struct {
 
 var _ io.Writer = &logWriter{}
 
+const errorLogPrefix = "{\"level\":\"error\""
+
 func (l *logWriter) Write(bytes []byte) (int, error) {
-	l.logs = append(l.logs, string(bytes))
+	logStr := string(bytes)
+
+	// Ignore non-error logs
+	if !strings.HasPrefix(logStr, errorLogPrefix) {
+		return 0, nil
+	}
+
+	l.logs = append(l.logs, logStr)
 	return len(bytes), nil
 }
 
@@ -154,21 +164,20 @@ func TestChangeContractCodeMigration(t *testing.T) {
 			ChainID:            flow.Emulator,
 			VerboseErrorOutput: true,
 		}
-		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options)
+		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options).
+			WithStagedContractUpdates([]migrations.StagedContract{
+				{
+					Address: common.Address(address1),
+					Contract: migrations.Contract{
+						Name: "A",
+						Code: []byte(updatedContractA),
+					},
+				},
+			})
 
 		err := migration.InitMigration(log, nil, 0)
 		require.NoError(t, err)
 
-		migration.RegisterContractChange(
-			migrations.StagedContract{
-				Address: common.Address(address1),
-				Contract: migrations.Contract{
-					Name: "A",
-					Code: []byte(updatedContractA),
-				},
-			},
-		)
-
 		payloads, err := migration.MigrateAccount(
 			ctx,
 			common.Address(address1),
@@ -203,21 +212,20 @@ func TestChangeContractCodeMigration(t *testing.T) {
 			ChainID:            flow.Emulator,
 			VerboseErrorOutput: true,
 		}
-		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options)
+		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options).
+			WithStagedContractUpdates([]migrations.StagedContract{
+				{
+					Address: common.Address(address1),
+					Contract: migrations.Contract{
+						Name: "A",
+						Code: []byte(updatedContractA),
+					},
+				},
+			})
 
 		err := migration.InitMigration(log, nil, 0)
 		require.NoError(t, err)
 
-		migration.RegisterContractChange(
-			migrations.StagedContract{
-				Address: common.Address(address1),
-				Contract: migrations.Contract{
-					Name: "A",
-					Code: []byte(updatedContractA),
-				},
-			},
-		)
-
 		payloads, err := migration.MigrateAccount(
 			ctx,
 			common.Address(address1),
@@ -250,30 +258,27 @@ func TestChangeContractCodeMigration(t *testing.T) {
 			ChainID:            flow.Emulator,
 			VerboseErrorOutput: true,
 		}
-		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options)
+		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options).
+			WithStagedContractUpdates([]migrations.StagedContract{
+				{
+					Address: common.Address(address1),
+					Contract: migrations.Contract{
+						Name: "A",
+						Code: []byte(updatedContractA),
+					},
+				},
+				{
+					Address: common.Address(address1),
+					Contract: migrations.Contract{
+						Name: "B",
+						Code: []byte(updatedContractB),
+					},
+				},
+			})
 
 		err := migration.InitMigration(log, nil, 0)
 		require.NoError(t, err)
 
-		migration.RegisterContractChange(
-			migrations.StagedContract{
-				Address: common.Address(address1),
-				Contract: migrations.Contract{
-					Name: "A",
-					Code: []byte(updatedContractA),
-				},
-			},
-		)
-		migration.RegisterContractChange(
-			migrations.StagedContract{
-				Address: common.Address(address1),
-				Contract: migrations.Contract{
-					Name: "B",
-					Code: []byte(updatedContractB),
-				},
-			},
-		)
-
 		payloads, err := migration.MigrateAccount(
 			ctx,
 			common.Address(address1),
@@ -306,21 +311,20 @@ func TestChangeContractCodeMigration(t *testing.T) {
 			ChainID:            flow.Emulator,
 			VerboseErrorOutput: true,
 		}
-		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options)
+		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options).
+			WithStagedContractUpdates([]migrations.StagedContract{
+				{
+					Address: common.Address(address1),
+					Contract: migrations.Contract{
+						Name: "A",
+						Code: []byte(updatedContractA),
+					},
+				},
+			})
 
 		err := migration.InitMigration(log, nil, 0)
 		require.NoError(t, err)
 
-		migration.RegisterContractChange(
-			migrations.StagedContract{
-				Address: common.Address(address1),
-				Contract: migrations.Contract{
-					Name: "A",
-					Code: []byte(updatedContractA),
-				},
-			},
-		)
-
 		payloads, err := migration.MigrateAccount(
 			ctx,
 			common.Address(address1),
@@ -357,30 +361,27 @@ func TestChangeContractCodeMigration(t *testing.T) {
 			ChainID:            flow.Emulator,
 			VerboseErrorOutput: true,
 		}
-		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options)
+		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options).
+			WithStagedContractUpdates([]migrations.StagedContract{
+				{
+					Address: common.Address(address1),
+					Contract: migrations.Contract{
+						Name: "A",
+						Code: []byte(updatedContractA),
+					},
+				},
+				{
+					Address: common.Address(address1),
+					Contract: migrations.Contract{
+						Name: "B",
+						Code: []byte(updatedContractB),
+					},
+				},
+			})
 
 		err := migration.InitMigration(log, nil, 0)
 		require.NoError(t, err)
 
-		migration.RegisterContractChange(
-			migrations.StagedContract{
-				Address: common.Address(address1),
-				Contract: migrations.Contract{
-					Name: "A",
-					Code: []byte(updatedContractA),
-				},
-			},
-		)
-		migration.RegisterContractChange(
-			migrations.StagedContract{
-				Address: common.Address(address1),
-				Contract: migrations.Contract{
-					Name: "B",
-					Code: []byte(updatedContractB),
-				},
-			},
-		)
-
 		_, err = migration.MigrateAccount(
 			ctx,
 			common.Address(address1),
@@ -410,21 +411,20 @@ func TestChangeContractCodeMigration(t *testing.T) {
 			ChainID:            flow.Emulator,
 			VerboseErrorOutput: true,
 		}
-		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options)
+		migration := migrations.NewStagedContractsMigration("test", "test", log, rwf, options).
+			WithStagedContractUpdates([]migrations.StagedContract{
+				{
+					Address: common.Address(address2),
+					Contract: migrations.Contract{
+						Name: "A",
+						Code: []byte(updatedContractA),
+					},
+				},
+			})
 
 		err := migration.InitMigration(log, nil, 0)
 		require.NoError(t, err)
 
-		migration.RegisterContractChange(
-			migrations.StagedContract{
-				Address: common.Address(address2),
-				Contract: migrations.Contract{
-					Name: "A",
-					Code: []byte(updatedContractA),
-				},
-			},
-		)
-
 		_, err = migration.MigrateAccount(
 			ctx,
 			common.Address(address1),