[fixup] update test names and use constants in tests

persistence/trees/atomic_test.go

@@ -13,6 +13,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+const (
+	// the root hash of a tree store where each tree is empty but present and initialized
+	h0 = "302f2956c084cc3e0e760cf1b8c2da5de79c45fa542f68a660a5fc494b486972"
+	// the root hash of a tree store where each tree has has key foo value bar added to it
+	h1 = "7d5712ea1507915c40e295845fa58773baa405b24b87e9d99761125d826ff915"
+)
+
 func TestTreeStore_AtomicUpdatesWithSuccessfulRollback(t *testing.T) {
 	ctrl := gomock.NewController(t)
 
@@ -32,6 +39,7 @@ func TestTreeStore_AtomicUpdatesWithSuccessfulRollback(t *testing.T) {
 
 	hash0 := ts.getStateHash()
 	require.NotEmpty(t, hash0)
+	require.Equal(t, hash0, h0)
 
 	require.NoError(t, ts.Savepoint())
 
@@ -48,6 +56,7 @@ func TestTreeStore_AtomicUpdatesWithSuccessfulRollback(t *testing.T) {
 	hash1 := ts.getStateHash()
 	require.NotEmpty(t, hash1)
 	require.NotEqual(t, hash0, hash1)
+	require.Equal(t, hash1, h1)
 
 	// set a new savepoint
 	require.NoError(t, ts.Savepoint())
@@ -56,8 +65,10 @@ func TestTreeStore_AtomicUpdatesWithSuccessfulRollback(t *testing.T) {
 	// assert that savepoint creation doesn't mutate state hash
 	require.Equal(t, hash1, hex.EncodeToString(ts.PrevState.RootTree.tree.Root()))
 
+	// verify that creating a savepoint does not change state hash
 	hash2 := ts.getStateHash()
 	require.Equal(t, hash2, hash1)
+	require.Equal(t, hash2, h1)
 
 	// validate that state tree was updated and a previous savepoint is created
 	for _, treeName := range stateTreeNames {
@@ -76,4 +87,5 @@ func TestTreeStore_AtomicUpdatesWithSuccessfulRollback(t *testing.T) {
 	// validate that the state hash is unchanged after new data was inserted but rolled back before commitment
 	hash3 := ts.getStateHash()
 	require.Equal(t, hash3, hash2)
+	require.Equal(t, hash3, h1)
 }

persistence/trees/trees.go

@@ -260,9 +260,6 @@ func (t *treeStore) updateMerkleTrees(pgtx pgx.Tx, txi indexer.TxIndexer, height
 		}
 	}
 
-	if err := t.Commit(); err != nil {
-		return "", fmt.Errorf("failed to commit: %w", err)
-	}
 	return t.getStateHash(), nil
 }
 

persistence/trees/trees_test.go

@@ -37,13 +37,17 @@ var (
 	genesisStateNumApplications = 1
 )
 
+const (
+	h1 = "5282ee91a3ec0a6f2b30e4780b369bae78c80ef3ea40587fef6ae263bf41f244"
+)
+
 func TestTreeStore_Update(t *testing.T) {
 	pool, resource, dbUrl := test_artifacts.SetupPostgresDocker()
 	t.Cleanup(func() {
 		require.NoError(t, pool.Purge(resource))
 	})
 
-	t.Run("should update actor trees, commit and modify the state hash", func(t *testing.T) {
+	t.Run("should update actor trees, commit, and modify the state hash", func(t *testing.T) {
 		pmod := newTestPersistenceModule(t, dbUrl)
 		context := newTestPostgresContext(t, 0, pmod)
 
@@ -52,6 +56,7 @@ func TestTreeStore_Update(t *testing.T) {
 		hash1, err := context.ComputeStateHash()
 		require.NoError(t, err)
 		require.NotEmpty(t, hash1)
+		require.Equal(t, hash1, h1)
 
 		_, err = createAndInsertDefaultTestApp(t, context)
 		require.NoError(t, err)
@@ -65,26 +70,12 @@ func TestTreeStore_Update(t *testing.T) {
 	})
 }
 
-func newTestPersistenceModule(t *testing.T, databaseUrl string) modules.PersistenceModule {
+func newTestPersistenceModule(t *testing.T, databaseURL string) modules.PersistenceModule {
 	t.Helper()
 	teardownDeterministicKeygen := keygen.GetInstance().SetSeed(42)
 	defer teardownDeterministicKeygen()
 
-	cfg := &configs.Config{
-		Persistence: &configs.PersistenceConfig{
-			PostgresUrl:       databaseUrl,
-			NodeSchema:        testSchema,
-			BlockStorePath:    ":memory:",
-			TxIndexerPath:     ":memory:",
-			TreesStoreDir:     ":memory:",
-			MaxConnsCount:     5,
-			MinConnsCount:     1,
-			MaxConnLifetime:   "5m",
-			MaxConnIdleTime:   "1m",
-			HealthCheckPeriod: "30s",
-		},
-	}
-
+	cfg := newTestDefaultConfig(t, databaseURL)
 	genesisState, _ := test_artifacts.NewGenesisState(
 		genesisStateNumValidators,
 		genesisStateNumServicers,
@@ -102,6 +93,26 @@ func newTestPersistenceModule(t *testing.T, databaseUrl string) modules.Persiste
 
 	return persistenceMod.(modules.PersistenceModule)
 }
+
+// fetches a new default node configuration for testing
+func newTestDefaultConfig(t *testing.T, databaseURL string) *configs.Config {
+	t.Helper()
+	cfg := &configs.Config{
+		Persistence: &configs.PersistenceConfig{
+			PostgresUrl:       databaseURL,
+			NodeSchema:        testSchema,
+			BlockStorePath:    ":memory:",
+			TxIndexerPath:     ":memory:",
+			TreesStoreDir:     ":memory:",
+			MaxConnsCount:     5,
+			MinConnsCount:     1,
+			MaxConnLifetime:   "5m",
+			MaxConnIdleTime:   "1m",
+			HealthCheckPeriod: "30s",
+		},
+	}
+	return cfg
+}
 func createAndInsertDefaultTestApp(t *testing.T, db *persistence.PostgresContext) (*coreTypes.Actor, error) {
 	t.Helper()
 	app := newTestApp(t)