Skip to content

Commit a4667a3

Browse files
authored
Merge pull request #394 from onflow/auto-update-onflow-cadence-v1.0.0-preview.35
2 parents 0b0be61 + 3fd2e73 commit a4667a3

File tree

3 files changed

+39
-28
lines changed

3 files changed

+39
-28
lines changed

test/go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.22
55
require (
66
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
77
github.com/onflow/atree v0.7.0-rc.2
8-
github.com/onflow/cadence v1.0.0-preview.34
9-
github.com/onflow/flow-emulator v1.0.0-preview.32
10-
github.com/onflow/flow-go v0.35.14-crescendo-preview.27
11-
github.com/onflow/flow-go-sdk v1.0.0-preview.36
8+
github.com/onflow/cadence v1.0.0-preview.35
9+
github.com/onflow/flow-emulator v1.0.0-preview.33
10+
github.com/onflow/flow-go v0.35.14-crescendo-preview.27.0.20240626210601-604590f19db9
11+
github.com/onflow/flow-go-sdk v1.0.0-preview.37
1212
github.com/rs/zerolog v1.29.0
1313
github.com/stretchr/testify v1.9.0
1414
)
@@ -126,15 +126,15 @@ require (
126126
github.com/multiformats/go-varint v0.0.7 // indirect
127127
github.com/olekukonko/tablewriter v0.0.5 // indirect
128128
github.com/onflow/crypto v0.25.1 // indirect
129-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.1.0 // indirect
130-
github.com/onflow/flow-core-contracts/lib/go/templates v1.0.0 // indirect
129+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.0 // indirect
130+
github.com/onflow/flow-core-contracts/lib/go/templates v1.3.0 // indirect
131131
github.com/onflow/flow-ft/lib/go/contracts v1.0.0 // indirect
132132
github.com/onflow/flow-ft/lib/go/templates v1.0.0 // indirect
133133
github.com/onflow/flow-nft/lib/go/contracts v1.2.1 // indirect
134134
github.com/onflow/flow-nft/lib/go/templates v1.2.0 // indirect
135135
github.com/onflow/flow/protobuf/go/flow v0.4.4 // indirect
136136
github.com/onflow/go-ethereum v1.13.4 // indirect
137-
github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba // indirect
137+
github.com/onflow/sdks v0.6.0-preview.1 // indirect
138138
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
139139
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
140140
github.com/pierrec/lz4 v2.6.1+incompatible // indirect

test/go.sum

+14-13
Original file line numberDiff line numberDiff line change
@@ -1933,26 +1933,26 @@ github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs
19331933
github.com/onflow/atree v0.7.0-rc.2 h1:mZmVrl/zPlfI44EjV3FdR2QwIqT8nz1sCONUBFcML/U=
19341934
github.com/onflow/atree v0.7.0-rc.2/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM=
19351935
github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8=
1936-
github.com/onflow/cadence v1.0.0-preview.34 h1:MJSli75W6LJVUqSx/tq4MQe64H1+EcQBD/sNgpOO4jE=
1937-
github.com/onflow/cadence v1.0.0-preview.34/go.mod h1:jOwvPSSLTr9TvaKMs7KKiBYMmpdpNNAFxBsjMlrqVD0=
1936+
github.com/onflow/cadence v1.0.0-preview.35 h1:HZgt/9Foa6sCSH9SNaIFUSXK6q2ZxETg0ivsZbf+hhU=
1937+
github.com/onflow/cadence v1.0.0-preview.35/go.mod h1:jOwvPSSLTr9TvaKMs7KKiBYMmpdpNNAFxBsjMlrqVD0=
19381938
github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
19391939
github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
19401940
github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
1941-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.1.0 h1:AegPBm079X0qjneUYs+mRCpEUxSZ1lw5h4MbuXHlqn0=
1942-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.1.0/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg=
1943-
github.com/onflow/flow-core-contracts/lib/go/templates v1.0.0 h1:za6bxPPW4JIsthhasUDTa1ruKjIO8DIhun9INQfj61Y=
1944-
github.com/onflow/flow-core-contracts/lib/go/templates v1.0.0/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30=
1945-
github.com/onflow/flow-emulator v1.0.0-preview.32 h1:VkJL7u75XUB8077CQvojKhxSCGirGCrsjAxjTOUIpD4=
1946-
github.com/onflow/flow-emulator v1.0.0-preview.32/go.mod h1:wwHM6+cJ5s3BIS9Wj0pXTRumj9n929fqwNuXqOD1g7g=
1941+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.0 h1:cq3RfBr9TnTSnsGlUHMjMGZib24Horfb1XJqMpkN5ew=
1942+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.0/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg=
1943+
github.com/onflow/flow-core-contracts/lib/go/templates v1.3.0 h1:aMFJdB2CW+Dzm+AJ5QN6J1yWh+a0l2RxHN2/TtLaXUo=
1944+
github.com/onflow/flow-core-contracts/lib/go/templates v1.3.0/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30=
1945+
github.com/onflow/flow-emulator v1.0.0-preview.33 h1:1LFVpZJrgAZjPr5Jou3dbg6zOO5GMREnmE1dr9ndnJE=
1946+
github.com/onflow/flow-emulator v1.0.0-preview.33/go.mod h1:4T/kFzo8jccGF8GbxLlu3b/jwBH6GxX8p0hTPURHZ7k=
19471947
github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0=
19481948
github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
19491949
github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs=
19501950
github.com/onflow/flow-ft/lib/go/templates v1.0.0/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
1951-
github.com/onflow/flow-go v0.35.14-crescendo-preview.27 h1:sWjWsutcFOP9o/etZF3Zii0eq4MMqKQchquwmyElWCQ=
1952-
github.com/onflow/flow-go v0.35.14-crescendo-preview.27/go.mod h1:P7AnyTH5W+hNm5pmhnYasIh7T6Z2kU4tiy53NJKvhZA=
1951+
github.com/onflow/flow-go v0.35.14-crescendo-preview.27.0.20240626210601-604590f19db9 h1:9GfHBXy9T8QEAkwX+KkmZjJadSOAVgiyn2n8s7sSueY=
1952+
github.com/onflow/flow-go v0.35.14-crescendo-preview.27.0.20240626210601-604590f19db9/go.mod h1:SE4kph7kpF6ydOXObtueEecGk3Hrjy/if/0UHY/eRO8=
19531953
github.com/onflow/flow-go-sdk v1.0.0-M1/go.mod h1:TDW0MNuCs4SvqYRUzkbRnRmHQL1h4X8wURsCw9P9beo=
1954-
github.com/onflow/flow-go-sdk v1.0.0-preview.36 h1:3g72MjmZPEEVAbtDATbjwqKoNSB7yHLWswUHSAB5zwQ=
1955-
github.com/onflow/flow-go-sdk v1.0.0-preview.36/go.mod h1:mjkXIluC+kseYyd8Z1aTq73IiffAUeoY5fuX/C2Z+1w=
1954+
github.com/onflow/flow-go-sdk v1.0.0-preview.37 h1:ujeIQheD+skzFt9+eOT9nXcc1rFxVLSCzwisEI3+2DA=
1955+
github.com/onflow/flow-go-sdk v1.0.0-preview.37/go.mod h1:2aSN7RdKzxWoCtCyOJz9W/ZNqkLgQDQS3hKLYwPlvGw=
19561956
github.com/onflow/flow-nft/lib/go/contracts v1.2.1 h1:woAAS5z651sDpi7ihAHll8NvRS9uFXIXkL6xR+bKFZY=
19571957
github.com/onflow/flow-nft/lib/go/contracts v1.2.1/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE=
19581958
github.com/onflow/flow-nft/lib/go/templates v1.2.0 h1:JSQyh9rg0RC+D1930BiRXN8lrtMs+ubVMK6aQPon6Yc=
@@ -1962,8 +1962,9 @@ github.com/onflow/flow/protobuf/go/flow v0.4.4 h1:lD1owoZGFgLcvdLZDmP0Kc4GOuQeSU
19621962
github.com/onflow/flow/protobuf/go/flow v0.4.4/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
19631963
github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc=
19641964
github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
1965-
github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo=
19661965
github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
1966+
github.com/onflow/sdks v0.6.0-preview.1 h1:mb/cUezuqWEP1gFZNAgUI4boBltudv4nlfxke1KBp9k=
1967+
github.com/onflow/sdks v0.6.0-preview.1/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
19671968
github.com/onflow/wal v1.0.2 h1:5bgsJVf2O3cfMNK12fiiTyYZ8cOrUiELt3heBJfHOhc=
19681969
github.com/onflow/wal v1.0.2/go.mod h1:iMC8gkLqu4nkbkAla5HkSBb+FGyQOZiWz3DYm2wSXCk=
19691970
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

test/test_framework_test.go

+18-8
Original file line numberDiff line numberDiff line change
@@ -701,17 +701,27 @@ func TestImportContract(t *testing.T) {
701701
// Test access of methods & fields from deployed contract
702702
Test.assertEqual("Hi from BarContract", BarContract.sayHi())
703703
Test.assertEqual(/public/BarContractPublicPath, BarContract.publicPath)
704-
Test.assertEqual(
705-
["one", "two", "three"],
706-
BarContract.proposals
707-
)
704+
705+
// TODO:
706+
//Test.assertEqual(
707+
// &["one", "two", "three"] as &[String],
708+
// BarContract.proposals
709+
//)
710+
Test.assertEqual("one", BarContract.proposals[0])
711+
Test.assertEqual("two", BarContract.proposals[1])
712+
Test.assertEqual("three", BarContract.proposals[2])
708713
709714
// Test access of methods & fields from deployed contract
710715
Test.assertEqual("Hi from FooContract", FooContract.sayHi())
711-
Test.assertEqual(
712-
{1: "one", 2: "two", 3: "three"},
713-
FooContract.numbers
714-
)
716+
717+
// TODO:
718+
//Test.assertEqual(
719+
// &{1: "one", 2: "two", 3: "three"} as &{Int: String},
720+
// FooContract.numbers
721+
//)
722+
Test.assertEqual("one" as String?, FooContract.numbers[1])
723+
Test.assertEqual("two" as String?, FooContract.numbers[2])
724+
Test.assertEqual("three" as String?, FooContract.numbers[3])
715725
716726
// Test access of methods & fields from deployed contract
717727
Test.assertEqual("Hi from BazContract", BazContract.sayHi())

0 commit comments

Comments
 (0)