Merge pull request #540 from onflow/bastian/update-flow-go

Update to latest flow-go feature/stable-cadence
onflow · Dec 28, 2023 · 70dcc68 · 70dcc68
2 parents 9116c41 + 65530e5
commit 70dcc68
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -15,11 +15,11 @@ require (
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/onflow/cadence v1.0.0-preview.1.0.20231213191345-0ff20e15e7e1
 	github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1-0.20231204202154-f8dfacb39d86
-	github.com/onflow/flow-go v0.32.4-0.20231214190912-4c4527a42fb0
+	github.com/onflow/flow-go v0.32.4-0.20231220215809-5d681fdf0c1f
 	github.com/onflow/flow-go-sdk v0.44.0-stable-cadence.2
 	github.com/onflow/flow-go/crypto v0.25.0
 	github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20231213195450-0b951b342b14
-	github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231124194313-106cc495def6
+	github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231213135419-ae911cc351a2
 	github.com/prometheus/client_golang v1.16.0
 	github.com/psiemens/graceland v1.0.0
 	github.com/psiemens/sconfig v0.1.0

diff --git a/go.sum b/go.sum
@@ -1372,8 +1372,8 @@ github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1-0.20231204202154-
 github.com/onflow/flow-core-contracts/lib/go/templates v0.15.1-0.20231204202154-f8dfacb39d86/go.mod h1:6XIbPht7u7ADszXSHI2APY+OL78XVaUU8+OdgWEElAY=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20231212194336-a2802ba36596 h1:MTgrwXkiWwNysYpWGzWjc1n9w1nfXvizmGkSAuEY6jk=
 github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20231212194336-a2802ba36596/go.mod h1:uugR8U8Rlk2Xbn1ne7WWkPIcLReOyyXeQ/6tBg2Lsu8=
-github.com/onflow/flow-go v0.32.4-0.20231214190912-4c4527a42fb0 h1:cWH+cVzRmogm75GgmxecUoDYMSi2yZMv3/PgVM41N9o=
-github.com/onflow/flow-go v0.32.4-0.20231214190912-4c4527a42fb0/go.mod h1:PsXOc6UemYCzE7SXn3geQrpn7YdNaixkwuyPZp0cwjg=
+github.com/onflow/flow-go v0.32.4-0.20231220215809-5d681fdf0c1f h1:AWMrhWQ1ElNc4wfbzfsfQOFojYwH5NCJnwR+uGGTcvk=
+github.com/onflow/flow-go v0.32.4-0.20231220215809-5d681fdf0c1f/go.mod h1:NXEPIQySkuLXCcPHPirUeihEGW0vMC6oYDkVUCpQBlY=
 github.com/onflow/flow-go-sdk v0.41.7-stable-cadence/go.mod h1:ejVN+bqcsTHVvRpDDJDoBNdmcxUfFMW4IvdTbMeQ/hQ=
 github.com/onflow/flow-go-sdk v0.44.0-stable-cadence.2 h1:vUVO6m85BiT8c50Oc8YGc3CU+sGqiKW9FZbmiRph2dU=
 github.com/onflow/flow-go-sdk v0.44.0-stable-cadence.2/go.mod h1:mbLrR3MkYbi9LH3yasDj1jrR4QTR8vjRLVFCm4jMHn0=
@@ -1383,8 +1383,8 @@ github.com/onflow/flow-go/crypto v0.25.0/go.mod h1:OOb2vYcS8AOCajBClhHTJ0NKftFl1
 github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20231213195450-0b951b342b14 h1:pHblchb5rKrpt1xmeKnMNq3utzBi2bvepHu7z1ZPWjw=
 github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20231213195450-0b951b342b14/go.mod h1:OKA2xWNugqqbaFSmxdb1VWixtuqSdz/VK1MlbdcIUxw=
 github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20221202093946-932d1c70e288/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
-github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231124194313-106cc495def6 h1:KMN+OEVaw7KAgxL3p8ux7CMuyTvacAlYTbasOqowh4M=
-github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231124194313-106cc495def6/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
+github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231213135419-ae911cc351a2 h1:+rT+UsfTR39JZO8ht2+4fkaWfHw74SCj1fyz1lWuX8A=
+github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231213135419-ae911cc351a2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
 github.com/onflow/sdks v0.5.0/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
 github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo=
 github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=

diff --git a/storage/memstore/memstore_test.go b/storage/memstore/memstore_test.go
@@ -35,7 +35,7 @@ func TestMemstore(t *testing.T) {
 	t.Parallel()
 
 	const blockHeight = 0
-	key := flow.NewRegisterID("", "foo")
+	key := flow.NewRegisterID(flow.EmptyAddress, "foo")
 	value := []byte("bar")
 	store := New()
 
@@ -75,7 +75,7 @@ func TestMemstoreSetValueToNil(t *testing.T) {
 	t.Parallel()
 
 	store := New()
-	key := flow.NewRegisterID("", "foo")
+	key := flow.NewRegisterID(flow.EmptyAddress, "foo")
 	value := []byte("bar")
 	var nilByte []byte
 	nilValue := nilByte
@@ -93,7 +93,7 @@ func TestMemstoreSetValueToNil(t *testing.T) {
 	// check initial value
 	ledger, err := store.LedgerByHeight(context.Background(), 0)
 	require.NoError(t, err)
-	register, err := ledger.Get(flow.NewRegisterID(key.Owner, key.Key))
+	register, err := ledger.Get(flow.NewRegisterID(flow.HexToAddress(key.Owner), key.Key))
 	require.NoError(t, err)
 	require.Equal(t, string(value), string(register))
 
@@ -110,7 +110,7 @@ func TestMemstoreSetValueToNil(t *testing.T) {
 	// check value is nil
 	ledger, err = store.LedgerByHeight(context.Background(), 1)
 	require.NoError(t, err)
-	register, err = ledger.Get(flow.NewRegisterID(key.Owner, key.Key))
+	register, err = ledger.Get(flow.NewRegisterID(flow.HexToAddress(key.Owner), key.Key))
 	require.NoError(t, err)
 	require.Equal(t, string(nilValue), string(register))
 }
diff --git a/storage/store_test.go b/storage/store_test.go
@@ -247,7 +247,7 @@ func TestLedger(t *testing.T) {
 
 		var blockHeight uint64 = 1
 
-		const owner = ""
+		owner := flow.EmptyAddress
 		const key = "foo"
 		expected := []byte("bar")
 
@@ -284,7 +284,7 @@ func TestLedger(t *testing.T) {
 			require.NoError(t, os.RemoveAll(dir))
 		}()
 
-		const owner = ""
+		owner := flow.EmptyAddress
 
 		// Create a list of ledgers, where the ledger at index i has
 		// keys (i+2)-1->(i+2)+1 set to value i-1.