adjust expected state commitments

Author: turbolent

engine/execution/state/bootstrap/bootstrap_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/onflow/flow-go/engine/execution/state"
 	"github.com/onflow/flow-go/engine/execution/storehouse"
 	"github.com/onflow/flow-go/fvm"
-	"github.com/onflow/flow-go/fvm/cadence_vm"
 	"github.com/onflow/flow-go/fvm/systemcontracts"
 	completeLedger "github.com/onflow/flow-go/ledger/complete"
 	"github.com/onflow/flow-go/ledger/complete/wal/fixtures"
@@ -58,10 +57,9 @@ func TestBootstrapLedger(t *testing.T) {
 }
 
 func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
-	expectedStateCommitmentBytes, _ := hex.DecodeString(ifCompile(
-		"3ee915c0ecaf1399d00cc6a768517aa074139ca07045d4e63a1745fc81e1bdf0",
-		"bec4478e1b3aa1fd822c796411e69bd85ef9529b9ef93e231d4b02470d49b4f0",
-	))
+	expectedStateCommitmentBytes, _ := hex.DecodeString(
+		"4c71561153301a0dea2e6cc74255ff6473b5ef4b66c7701bbcf8358249ce2048",
+	)
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)
 
@@ -97,13 +95,6 @@ func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
 	})
 }
 
-func ifCompile[T any](a, b T) T {
-	if cadence_vm.DefaultEnabled {
-		return a
-	}
-	return b
-}
-
 // TestBootstrapLedger_EmptyTransaction bootstraps a ledger with:
 // - transaction fees
 // - storage fees
@@ -116,10 +107,7 @@ func ifCompile[T any](a, b T) T {
 // This tests that the state commitment has not changed for the bookkeeping parts of the transaction.
 func TestBootstrapLedger_EmptyTransaction(t *testing.T) {
 	expectedStateCommitmentBytes, _ := hex.DecodeString(
-		ifCompile(
-			"505aa62b494f262df6830b4ace90ee35d5e4574155db4361eff5e97ae4377d31",
-			"b21c4cea6518d92c34d2eeff1a02f7e1b7b75f9c0e0e52069905bb728361d039",
-		),
+		"def8795537883765992fda2ef6aafd6b0448bd0cf514f551ee7e7803cd13d11f",
 	)
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)

fvm/environment/programs_test.go

@@ -790,7 +790,7 @@ func Test_ProgramsDoubleCounting(t *testing.T) {
 		// hit B because interpreting C because interpreting transaction
 		// hit A because interpreting B because interpreting C because interpreting transaction
 		// hit A2 because interpreting B because interpreting C because interpreting transaction
-		require.Equal(t, ifCompile(33, 7), metrics.CacheHits)
+		require.Equal(t, ifCompile(15, 7), metrics.CacheHits)
 		require.Equal(t, 4, metrics.CacheMisses)
 	})
 

fvm/evm/emulator/state/collection.go

@@ -257,8 +257,8 @@ func (v ByteStringValue) StoredValue(_ atree.SlabStorage) (atree.Value, error) {
 	return v, nil
 }
 
-func (v ByteStringValue) Storable(storage atree.SlabStorage, address atree.Address, maxInlineSize uint64) (atree.Storable, error) {
-	if uint64(v.ByteSize()) <= maxInlineSize {
+func (v ByteStringValue) Storable(storage atree.SlabStorage, address atree.Address, maxInlineSize uint32) (atree.Storable, error) {
+	if v.ByteSize() <= maxInlineSize {
 		return v, nil
 	}
 

utils/unittest/execution_state.go

@@ -8,7 +8,6 @@ import (
 	"github.com/onflow/crypto"
 	"github.com/onflow/crypto/hash"
 
-	"github.com/onflow/flow-go/fvm/cadence_vm"
 	"github.com/onflow/flow-go/model/flow"
 )
 
@@ -24,10 +23,7 @@ const ServiceAccountPrivateKeySignAlgo = crypto.ECDSAP256
 const ServiceAccountPrivateKeyHashAlgo = hash.SHA2_256
 
 // Pre-calculated state commitment with root account with the above private key
-var GenesisStateCommitmentHex = ifCompile(
-	"2aec1528d538f64d05d0fd7e1726f9bb5fd46ec904d2df87212c308235affc94",
-	"002ec8b7ddc16a5f057539433ab9e4190806a231a0ca00a1c666745c44104121",
-)
+var GenesisStateCommitmentHex = "8067eed3686a4193222fd59091aab352f5aba345013425f125b01566ffa8af49"
 
 var GenesisStateCommitment flow.StateCommitment
 
@@ -86,28 +82,15 @@ func GenesisStateCommitmentByChainID(chainID flow.ChainID) flow.StateCommitment
 	return commit
 }
 
-func ifCompile[T any](a, b T) T {
-	if cadence_vm.DefaultEnabled {
-		return a
-	}
-	return b
-}
-
 func genesisCommitHexByChainID(chainID flow.ChainID) string {
 	if chainID == flow.Mainnet {
 		return GenesisStateCommitmentHex
 	}
 	if chainID == flow.Testnet {
-		return ifCompile(
-			"85a5558c2a25a655d68fdcb29d4fa4dc457d86425da11d9ae7a1edd2dc859e2a",
-			"475d23a46aed725c9663bf77e8b41ab569d57bd52529840b38e730d031d662bf",
-		)
+		return "deae6a293742711f720dfaa04daefac686e21055d98fe4bfc110376cbc53b817"
 	}
 	if chainID == flow.Sandboxnet {
 		return "e1c08b17f9e5896f03fe28dd37ca396c19b26628161506924fbf785834646ea1"
 	}
-	return ifCompile(
-		"848de583931aaeb3eaf2cf144c5ad53df0d4704a7798205dc3e752e1e63d23a1",
-		"6a3bc6034668d0a8ce4e95e61482d9c729d8075b96e378d4583cf4398b3f3863",
-	)
+	return "7b1ba932c47835fab32271f47be7de2b0dac5155ef111ae4adeb0df9adf26c2a"
 }