Skip to content

Commit 628a687

Browse files
bjartekbjartek
committed
upgrade to flowkit v1.17.3 and readd sleep when failed to get transactions
1 parent 2560c68 commit 628a687

File tree

6 files changed

+61
-20
lines changed

6 files changed

+61
-20
lines changed

‎doc_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func ExampleOverflowState_Tx() {
3333
//🧑 Created account: emulator-first with address: 01cf0e2f2f715450 with flow: 10.00
3434
//🧑 Created account: emulator-second with address: 179b6b1cb6755e31 with flow: 10.00
3535
//📜 deploy contracts NonFungibleToken, Debug, MetadataViews
36-
//👌 Tx:arguments fee:0.00001000 gas:0
36+
//👌 Tx:arguments fee:0.00001000 gas:17
3737
//
3838
}
3939

@@ -55,7 +55,7 @@ func ExampleOverflowState_Tx_inline() {
5555
//🧑 Created account: emulator-first with address: 01cf0e2f2f715450 with flow: 10.00
5656
//🧑 Created account: emulator-second with address: 179b6b1cb6755e31 with flow: 10.00
5757
//📜 deploy contracts NonFungibleToken, Debug, MetadataViews
58-
//👌 Tx: fee:0.00001000 gas:8
58+
//👌 Tx: fee:0.00001000 gas:25
5959
//=== Events ===
6060
//A.f8d6e0586b0a20c7.Debug.Log
6161
// msg -> overflow ftw!
@@ -81,7 +81,7 @@ func ExampleOverflowState_Tx_multisign() {
8181
//🧑 Created account: emulator-first with address: 01cf0e2f2f715450 with flow: 10.00
8282
//🧑 Created account: emulator-second with address: 179b6b1cb6755e31 with flow: 10.00
8383
//📜 deploy contracts NonFungibleToken, Debug, MetadataViews
84-
//👌 Tx: fee:0.00001000 gas:8
84+
//👌 Tx: fee:0.00001000 gas:25
8585
//=== Events ===
8686
//A.f8d6e0586b0a20c7.Debug.Log
8787
// msg -> acct:0x179b6b1cb6755e31

‎go.mod‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ require (
88
github.com/fatih/color v1.16.0
99
github.com/fatih/structtag v1.2.0
1010
github.com/hexops/autogold v1.3.1
11-
github.com/onflow/cadence v0.42.9
12-
github.com/onflow/flow-emulator v0.61.1
13-
github.com/onflow/flow-go v0.33.2-0.20240306234901-64ab8d27ea30
14-
github.com/onflow/flow-go-sdk v0.46.0
15-
github.com/onflow/flowkit v1.17.1
11+
github.com/onflow/cadence v0.42.10
12+
github.com/onflow/flow-emulator v0.62.1
13+
github.com/onflow/flow-go v0.33.2-0.20240412174857-015156b297b5
14+
github.com/onflow/flow-go-sdk v0.46.2
15+
github.com/onflow/flowkit v1.17.3
1616
github.com/pkg/errors v0.9.1
1717
github.com/rs/zerolog v1.29.1
1818
github.com/samber/lo v1.38.1
@@ -37,7 +37,7 @@ require (
3737
github.com/StackExchange/wmi v1.2.1 // indirect
3838
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
3939
github.com/beorn7/perks v1.0.1 // indirect
40-
github.com/bits-and-blooms/bitset v1.7.0 // indirect
40+
github.com/bits-and-blooms/bitset v1.10.0 // indirect
4141
github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
4242
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 // indirect
4343
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -63,7 +63,7 @@ require (
6363
github.com/dustin/go-humanize v1.0.1 // indirect
6464
github.com/ef-ds/deque v1.0.4 // indirect
6565
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
66-
github.com/ethereum/go-ethereum v1.13.5 // indirect
66+
github.com/ethereum/go-ethereum v1.13.10 // indirect
6767
github.com/fsnotify/fsnotify v1.6.0 // indirect
6868
github.com/fxamacker/cbor/v2 v2.4.1-0.20230228173756-c0c9f774e40c // indirect
6969
github.com/fxamacker/circlehash v0.3.0 // indirect
@@ -87,6 +87,8 @@ require (
8787
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
8888
github.com/gorilla/websocket v1.5.0 // indirect
8989
github.com/gosuri/uilive v0.0.4 // indirect
90+
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.2 // indirect
91+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2 // indirect
9092
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
9193
github.com/hashicorp/errwrap v1.1.0 // indirect
9294
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -96,7 +98,7 @@ require (
9698
github.com/hexops/gotextdiff v1.0.3 // indirect
9799
github.com/hexops/valast v1.4.3 // indirect
98100
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
99-
github.com/holiman/uint256 v1.2.3 // indirect
101+
github.com/holiman/uint256 v1.2.4 // indirect
100102
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
101103
github.com/inconshreveable/mousetrap v1.1.0 // indirect
102104
github.com/invopop/jsonschema v0.7.0 // indirect
@@ -144,12 +146,13 @@ require (
144146
github.com/nightlyone/lockfile v1.0.0 // indirect
145147
github.com/olekukonko/tablewriter v0.0.5 // indirect
146148
github.com/onflow/atree v0.6.0 // indirect
147-
github.com/onflow/crypto v0.25.0 // indirect
149+
github.com/onflow/crypto v0.25.1 // indirect
148150
github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f // indirect
149151
github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f // indirect
150152
github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 // indirect
151153
github.com/onflow/flow-nft/lib/go/contracts v1.1.0 // indirect
152-
github.com/onflow/flow/protobuf/go/flow v0.3.7 // indirect
154+
github.com/onflow/flow/protobuf/go/flow v0.4.0 // indirect
155+
github.com/onflow/go-ethereum v1.13.4 // indirect
153156
github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead // indirect
154157
github.com/onflow/sdks v0.5.0 // indirect
155158
github.com/opentracing/opentracing-go v1.2.0 // indirect

‎go.sum‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
113113
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
114114
github.com/bits-and-blooms/bitset v1.7.0 h1:YjAGVd3XmtK9ktAbX8Zg2g2PwLIMjGREZJHlV4j7NEo=
115115
github.com/bits-and-blooms/bitset v1.7.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
116+
github.com/bits-and-blooms/bitset v1.10.0 h1:ePXTeiPEazB5+opbv5fr8umg2R/1NlzgDsyepwsSr88=
117+
github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
116118
github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ=
117119
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
118120
github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E=
@@ -233,6 +235,8 @@ github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1
233235
github.com/ethereum/go-ethereum v1.9.9/go.mod h1:a9TqabFudpDu1nucId+k9S8R9whYaHnGBLKFouA5EAo=
234236
github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk=
235237
github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0=
238+
github.com/ethereum/go-ethereum v1.13.10 h1:Ppdil79nN+Vc+mXfge0AuUgmKWuVv4eMqzoIVSdqZek=
239+
github.com/ethereum/go-ethereum v1.13.10/go.mod h1:sc48XYQxCzH3fG9BcrXCOOgQk2JfZzNAmIKnceogzsA=
236240
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
237241
github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
238242
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
@@ -421,7 +425,13 @@ github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
421425
github.com/gosuri/uilive v0.0.4 h1:hUEBpQDj8D8jXgtCdBu7sWsy5sbW/5GhuO8KBwJ2jyY=
422426
github.com/gosuri/uilive v0.0.4/go.mod h1:V/epo5LjjlDE5RJUcqx8dbw+zc93y5Ya3yg8tfZ74VI=
423427
github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
428+
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmonfrMlCDdsejg4CZE7c=
424429
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
430+
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.2 h1:uxUHSMwWDJ/9jVPHNumRC8WZOi3hrBL22ObVOoLg4ww=
431+
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.2/go.mod h1:BL7w7qd2l/j9jgY6WMhYutfOFQc0I8RTVwtjpnAMoTM=
432+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-20200501113911-9a95f0fdbfea/go.mod h1:GugMBs30ZSAkckqXEAIEGyYdDH6EgqowG8ppA3Zt+AY=
433+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2 h1:1aeRCnE2CkKYqyzBu0+B2lgTcZPc3ea2lGpijeHbI1c=
434+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2/go.mod h1:GhphxcdlaRyAuBSvo6rV71BvQcvB/vuX8ugCyybuS2k=
425435
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
426436
github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
427437
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
@@ -453,6 +463,8 @@ github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZ
453463
github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
454464
github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
455465
github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
466+
github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU=
467+
github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
456468
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
457469
github.com/huin/goupnp v0.0.0-20161224104101-679507af18f3/go.mod h1:MZ2ZmwcBpvOoJ22IJsc7va19ZwoheaBk43rKg12SKag=
458470
github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
@@ -684,29 +696,45 @@ github.com/onflow/atree v0.6.0/go.mod h1:gBHU0M05qCbv9NN0kijLWMgC47gHVNBIp4KmsVF
684696
github.com/onflow/cadence v0.20.1/go.mod h1:7mzUvPZUIJztIbr9eTvs+fQjWWHTF8veC+yk4ihcNIA=
685697
github.com/onflow/cadence v0.42.9 h1:EX+eak/Jjy9PyKcAEmOViGOHMyP/nCOwJO+deodZlJE=
686698
github.com/onflow/cadence v0.42.9/go.mod h1:1wFd+LiNiN6qoZXof3MBdpM6d8BsxbVIxOA77LbIYmE=
699+
github.com/onflow/cadence v0.42.10 h1:3oC5ceeXhdCrhHcf9H0yYXQKW3Tw/vkSXLe+PUZa4i0=
700+
github.com/onflow/cadence v0.42.10/go.mod h1:1wFd+LiNiN6qoZXof3MBdpM6d8BsxbVIxOA77LbIYmE=
687701
github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg=
688702
github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
703+
github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
704+
github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
689705
github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f h1:S8yIZw9LFXfYD1V5H9BiixihHw3GrXVPrmfplSzYaww=
690706
github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f/go.mod h1:jM6GMAL+m0hjusUgiYDNrixPQ6b9s8xjoJQoEu5bHQI=
691707
github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f h1:Ep+Mpo2miWMe4pjPGIaEvEzshRep30dvNgxqk+//FrQ=
692708
github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f/go.mod h1:ZeLxwaBkzuSInESGjL8/IPZWezF+YOYsYbMrZlhN+q4=
693709
github.com/onflow/flow-emulator v0.61.1 h1:7uCzphiAMjZbehsCSTQ8mQWUpMeKqjxCd45yYRvMEQk=
694710
github.com/onflow/flow-emulator v0.61.1/go.mod h1:YLR3/wi4Z9j7s9tJyIvTmxH3wAsO7zkFHSRrW0axyuE=
711+
github.com/onflow/flow-emulator v0.62.1 h1:VivECYftZbaIo9oZBVsmeE/LUcxdx7hJJ1ET2rGY8p8=
712+
github.com/onflow/flow-emulator v0.62.1/go.mod h1:JbvxBZ39Q8hOQ5fSwuV0ZJwfaiQeaYTiIY04ws8LcNE=
695713
github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0=
696714
github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU=
697715
github.com/onflow/flow-go v0.33.2-0.20240306234901-64ab8d27ea30 h1:1JkIA71XEspysh2EsAGeOi1gNc2/TgZJ9kGyyPWJWDU=
698716
github.com/onflow/flow-go v0.33.2-0.20240306234901-64ab8d27ea30/go.mod h1:I5sWWA5pHsJDlZV61iqqQ3k++IhB/k1qE/80s2sjP5s=
717+
github.com/onflow/flow-go v0.33.2-0.20240412174857-015156b297b5 h1:2785d9unR8CpzJzRQcMz+yjKKRmqN+Kbvu0gKdy6iT4=
718+
github.com/onflow/flow-go v0.33.2-0.20240412174857-015156b297b5/go.mod h1:FkonSWZ60bOtc5MdH+CRHScza34k+uNpa6GwXnRpUvg=
699719
github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74=
700720
github.com/onflow/flow-go-sdk v0.46.0 h1:mrIQziCDe6Oi5HH/aPFvYluh1XUwO6lYpoXLWrBZc2s=
701721
github.com/onflow/flow-go-sdk v0.46.0/go.mod h1:azVWF0yHI8wT1erF0vuYGqQZybl6Frbc+0Zu3rIPeHc=
722+
github.com/onflow/flow-go-sdk v0.46.2 h1:ypVGBeH9m5XpBOTU/CYVC0y/+z42e8mhUlq5aLiD24A=
723+
github.com/onflow/flow-go-sdk v0.46.2/go.mod h1:tfLjB9FZmwqtT5gaacjvpIhz7KCd67YPm6v+iqYAjEA=
702724
github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ=
703725
github.com/onflow/flow-nft/lib/go/contracts v1.1.0 h1:rhUDeD27jhLwOqQKI/23008CYfnqXErrJvc4EFRP2a0=
704726
github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9jxdwoTuuhjK8WYWXTyLkIigZY=
705727
github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
706728
github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk=
707729
github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
730+
github.com/onflow/flow/protobuf/go/flow v0.4.0 h1:5TGmPwRmnSt7aawgtPGF9ehoGHHir9Cy9LVoAiU9t/E=
731+
github.com/onflow/flow/protobuf/go/flow v0.4.0/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
708732
github.com/onflow/flowkit v1.17.1 h1:h8ok2cYsuKwu4BGAWOdMh6UancKyyYxsX6Kv0KCQIhQ=
709733
github.com/onflow/flowkit v1.17.1/go.mod h1:zu2r0bM5eebHBD3e3Bmp0IbAPcOvGxL17Nm3X0YpM2Q=
734+
github.com/onflow/flowkit v1.17.3 h1:0Fi3tLnieWOYq95A3ySk3TZ0GUPtKaX8ofssgve9e58=
735+
github.com/onflow/flowkit v1.17.3/go.mod h1:laapt1diM4Pbqt0dotKMH+LbUAOEqgugpH1p4+sPhcw=
736+
github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc=
737+
github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY=
710738
github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead h1:2j1Unqs76Z1b95Gu4C3Y28hzNUHBix7wL490e61SMSw=
711739
github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20221222181731-14b90207cead/go.mod h1:E3ScfQb5XcWJCIAdtIeEnr5i5l2y60GT0BTXeIHseWg=
712740
github.com/onflow/sdks v0.5.0 h1:2HCRibwqDaQ1c9oUApnkZtEAhWiNY2GTpRD5+ftdkN8=
@@ -788,7 +816,9 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
788816
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
789817
github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
790818
github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ=
819+
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
791820
github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
821+
github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo=
792822
github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc=
793823
github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU=
794824
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
@@ -1254,6 +1284,7 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw
12541284
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
12551285
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
12561286
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
1287+
golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
12571288
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
12581289
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
12591290
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

‎result.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ func (o OverflowResult) AssertComputationLessThenOrEqual(t *testing.T, computati
260260
assert.LessOrEqual(t, o.ComputationUsed, computation)
261261
/*
262262
if o.FeeGas != 0 {
263-
//TODO: https://github.com/onflow/flow-emulator/issues/542
264263
// assert.Equal(t, o.ComputationUsed, o.FeeGas)
265264
}
266265
*/
@@ -271,11 +270,10 @@ func (o OverflowResult) AssertComputationLessThenOrEqual(t *testing.T, computati
271270
func (o OverflowResult) AssertComputationUsed(t *testing.T, computation int) OverflowResult {
272271
t.Helper()
273272
assert.Equal(t, computation, o.ComputationUsed)
274-
//TODO: https://github.com/onflow/flow-emulator/issues/542
275273
/*
276-
if o.FeeGas != 0 {
277-
// assert.Equal(t, o.ComputationUsed, o.FeeGas)
278-
}
274+
if o.FeeGas != 0 {
275+
assert.Equal(t, o.ComputationUsed, o.FeeGas)
276+
}
279277
*/
280278

281279
return o

‎transaction.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,16 @@ func (o *OverflowState) GetTransactions(ctx context.Context, id flow.Identifier,
181181

182182
tx, txR, err := o.Flowkit.GetTransactionsByBlockID(ctx, id)
183183
if err != nil {
184-
return nil, nil, errors.Wrap(err, "getting transaction results")
184+
if err != nil {
185+
if logg != nil {
186+
logg.Debug("retry getting transactions")
187+
}
188+
time.Sleep(time.Millisecond * 500)
189+
tx, txR, err = o.Flowkit.GetTransactionsByBlockID(ctx, id)
190+
if err != nil {
191+
return nil, nil, errors.Wrap(err, "getting transaction results")
192+
}
193+
}
185194
}
186195

187196
logg.Debug("Fetched tx", zap.String("blockId", id.String()), zap.Int("tx", len(tx)), zap.Int("txR", len(txR)), zap.String("host", o.Flowkit.Network().Host))

‎transaction_integration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func TestTransactionIntegration(t *testing.T) {
105105
res.
106106
AssertSuccess(t).
107107
AssertDebugLog(t, "foobar").
108-
AssertComputationLessThenOrEqual(t, 40)
108+
AssertComputationLessThenOrEqual(t, 70)
109109
})
110110

111111
t.Run("Mint tokens and marshal event", func(t *testing.T) {

0 commit comments

Comments
 (0)