Merge pull request #3044 from onflow/bastian/update-atree

onflow · Jan 25, 2024 · 66e6d4f · 66e6d4f
2 parents deffd50 + 3e2e257
commit 66e6d4f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/kr/pretty v0.3.1
 	github.com/leanovate/gopter v0.2.9
 	github.com/logrusorgru/aurora/v4 v4.0.0
-	github.com/onflow/atree v0.6.1-0.20231024210403-cb829958cc5f
+	github.com/onflow/atree v0.6.1-0.20240124211117-2fbf86010ae6
 	github.com/rivo/uniseg v0.4.4
 	github.com/schollz/progressbar/v3 v3.13.1
 	github.com/stretchr/testify v1.8.4

diff --git a/go.sum b/go.sum
@@ -52,8 +52,8 @@ github.com/mattn/go-tty v0.0.4/go.mod h1:u5GGXBtZU6RQoKV8gY5W6UhMudbR5vXnUe7j3px
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/onflow/atree v0.6.1-0.20231024210403-cb829958cc5f h1:mmc7WjCGwiEkt1GlANRRoxxJRz469gBG0ik755gJJpg=
-github.com/onflow/atree v0.6.1-0.20231024210403-cb829958cc5f/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A=
+github.com/onflow/atree v0.6.1-0.20240124211117-2fbf86010ae6 h1:FwSfDsR7ipLoL5Iq0TR5Oe7PwOftjbksodIoY1nx6bM=
+github.com/onflow/atree v0.6.1-0.20240124211117-2fbf86010ae6/go.mod h1:7YNAyCd5JENq+NzH+fR1ABUZVzbSq9dkt0+5fZH3L2A=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/term v1.2.0-beta.2 h1:L3y/h2jkuBVFdWiJvNfYfKmzcCnILw7mJWm2JQuMppw=
 github.com/pkg/term v1.2.0-beta.2/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw=

diff --git a/runtime/interpreter/storagemap.go b/runtime/interpreter/storagemap.go
@@ -204,7 +204,7 @@ func (s StorageMap) Count() uint64 {
 // StorageMapIterator is an iterator over StorageMap
 type StorageMapIterator struct {
 	gauge       common.MemoryGauge
-	mapIterator *atree.MapIterator
+	mapIterator atree.MapIterator
 	storage     atree.SlabStorage
 }
 

diff --git a/runtime/interpreter/value.go b/runtime/interpreter/value.go
@@ -1556,7 +1556,7 @@ type ArrayValue struct {
 }
 
 type ArrayValueIterator struct {
-	atreeIterator *atree.ArrayIterator
+	atreeIterator atree.ArrayIterator
 }
 
 func (v *ArrayValue) Iterator(_ *Interpreter) ValueIterator {
@@ -18040,7 +18040,7 @@ func (v *DictionaryValue) Iterate(
 }
 
 type DictionaryKeyIterator struct {
-	mapIterator *atree.MapIterator
+	mapIterator atree.MapIterator
 }
 
 func (i DictionaryKeyIterator) NextKey(gauge common.MemoryGauge) Value {