merge fix and added test

onflow · Jan 2, 2024 · 0596ab0 · 0596ab0
1 parent aa2f796
commit 0596ab0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 67 deletions.
diff --git a/cmd/util/ledger/migrations/storage_fees_migration.go b/cmd/util/ledger/migrations/storage_fees_migration.go
diff --git a/cmd/util/ledger/util/payload_grouping_test.go b/cmd/util/ledger/util/payload_grouping_test.go
@@ -10,6 +10,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"
 
+	"github.com/onflow/cadence/runtime/common"
+
 	"github.com/onflow/flow-go/cmd/util/ledger/util"
 	"github.com/onflow/flow-go/ledger"
 	"github.com/onflow/flow-go/ledger/common/convert"
@@ -38,7 +40,22 @@ func TestGroupPayloadsByAccountCompareResults(t *testing.T) {
 	groups1 := util.GroupPayloadsByAccount(log, tmp1, 0)
 	groups2 := util.GroupPayloadsByAccount(log, tmp2, runtime.NumCPU())
 
+	groups3 := map[common.Address][]*ledger.Payload{}
+	for _, payload := range payloads {
+		key, err := payload.Key()
+		require.NoError(t, err)
+		registerID, err := convert.LedgerKeyToRegisterID(key)
+		require.NoError(t, err)
+		address, err := common.BytesToAddress([]byte(registerID.Owner))
+		require.NoError(t, err)
+		if _, ok := groups3[address]; !ok {
+			groups3[address] = []*ledger.Payload{}
+		}
+		groups3[address] = append(groups3[address], payload)
+	}
+
 	require.Equal(t, groups1.Len(), groups2.Len())
+	require.Equal(t, groups1.Len(), len(groups3))
 	for {
 		group1, err1 := groups1.Next()
 		group2, err2 := groups2.Next()
@@ -53,6 +70,7 @@ func TestGroupPayloadsByAccountCompareResults(t *testing.T) {
 
 		require.Equal(t, group1.Address, group2.Address)
 		require.Equal(t, len(group1.Payloads), len(group2.Payloads))
+		require.Equal(t, len(group1.Payloads), len(groups3[group1.Address]))
 	}
 }
 

diff --git a/cmd/util/ledger/util/util.go b/cmd/util/ledger/util/util.go
@@ -26,7 +26,7 @@ var _ atree.Ledger = &AccountsAtreeLedger{}
 func (a *AccountsAtreeLedger) GetValue(owner, key []byte) ([]byte, error) {
 	v, err := a.Accounts.GetValue(
 		flow.NewRegisterID(
-			string(flow.BytesToAddress(owner).Bytes()),
+			flow.BytesToAddress(owner),
 			string(key)))
 	if err != nil {
 		return nil, fmt.Errorf("getting value failed: %w", err)
@@ -37,7 +37,7 @@ func (a *AccountsAtreeLedger) GetValue(owner, key []byte) ([]byte, error) {
 func (a *AccountsAtreeLedger) SetValue(owner, key, value []byte) error {
 	err := a.Accounts.SetValue(
 		flow.NewRegisterID(
-			string(flow.BytesToAddress(owner).Bytes()),
+			flow.BytesToAddress(owner),
 			string(key)),
 		value)
 	if err != nil {
@@ -113,7 +113,7 @@ type PayloadsReadonlyLedger struct {
 }
 
 func (p *PayloadsReadonlyLedger) GetValue(owner, key []byte) (value []byte, err error) {
-	v, err := p.Snapshot.Get(flow.NewRegisterID(string(owner), string(key)))
+	v, err := p.Snapshot.Get(flow.NewRegisterID(flow.BytesToAddress(owner), string(key)))
 	if err != nil {
 		return nil, fmt.Errorf("getting value failed: %w", err)
 	}
@@ -129,7 +129,7 @@ func (p *PayloadsReadonlyLedger) SetValue(owner, key, value []byte) (err error)
 }
 
 func (p *PayloadsReadonlyLedger) ValueExists(owner, key []byte) (exists bool, err error) {
-	_, ok := p.Snapshot.Payloads[flow.NewRegisterID(string(owner), string(key))]
+	_, ok := p.Snapshot.Payloads[flow.NewRegisterID(flow.BytesToAddress(owner), string(key))]
 	return ok, nil
 }