Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move Encode/Decode to SerializableOrderedMap to prevent import loops #628

Merged
merged 18 commits into from
Jan 8, 2024
Merged

Move Encode/Decode to SerializableOrderedMap to prevent import loops #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
533e4aa
Update modules
muXxer Dec 23, 2023
8d62091
Add comments why iancoleman/orderedmap is used
muXxer Dec 23, 2023
664b6a4
Move Encode/Decode to SerializableOrderedMap to prevent import loops
muXxer Dec 23, 2023
e276609
Fix interdependencies in update and commit script
muXxer Dec 23, 2023
fce8407
Update "lo" submodule to commit "e276609"
muXxer Dec 23, 2023
3b9576e
Update "serializer" submodule to commit "fce8407"
muXxer Dec 23, 2023
9545787
Update "log" submodule to commit "3b9576e"
muXxer Dec 23, 2023
693ba06
Update "runtime" submodule to commit "9545787"
muXxer Dec 23, 2023
34cbd94
Update "ds" submodule to commit "693ba06"
muXxer Dec 23, 2023
b756093
Update "kvstore" submodule to commit "34cbd94"
muXxer Dec 23, 2023
2cb11d4
Update "ads" submodule to commit "b756093"
muXxer Dec 23, 2023
1522601
Update "app" submodule to commit "2cb11d4"
muXxer Dec 23, 2023
a39ab90
Update "apputils" submodule to commit "1522601"
muXxer Dec 23, 2023
b6ad1c3
Update "codegen" submodule to commit "a39ab90"
muXxer Dec 23, 2023
8ec4485
Update "crypto" submodule to commit "b6ad1c3"
muXxer Dec 23, 2023
09f78e1
Update "core" submodule to commit "8ec4485"
muXxer Dec 23, 2023
91257fb
Update "logger" submodule to commit "09f78e1"
muXxer Dec 23, 2023
711c417
Update "web" submodule to commit "91257fb"
muXxer Dec 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions ads/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,20 @@ module github.com/iotaledger/hive.go/ads
go 1.21

require (
github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f
github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f
github.com/iotaledger/hive.go/kvstore v0.0.0-20231214115948-1e569feb231f
github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f
github.com/iotaledger/hive.go/ds v0.0.0-20231223024711-b7560933e508
github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024711-b7560933e508
github.com/iotaledger/hive.go/kvstore v0.0.0-20231223024711-b7560933e508
github.com/iotaledger/hive.go/lo v0.0.0-20231223024711-b7560933e508
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024711-b7560933e508
github.com/pokt-network/smt v0.6.1
github.com/stretchr/testify v1.8.4
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ethereum/go-ethereum v1.13.5 // indirect
github.com/iancoleman/orderedmap v0.3.0 // indirect
github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect
github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f // indirect
github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f // indirect
github.com/iotaledger/hive.go/constraints v0.0.0-20231223024711-b7560933e508 // indirect
github.com/iotaledger/hive.go/runtime v0.0.0-20231223024711-b7560933e508 // indirect
github.com/iotaledger/hive.go/stringify v0.0.0-20231223024711-b7560933e508 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand Down
48 changes: 16 additions & 32 deletions ads/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,26 @@
github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E=
github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4=
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc=
github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk=
github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0=
github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc=
github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE=
github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f h1:wYhfBDVy875gugGqLxf+pTYBXZLOHO3zcP9gjd7wsEk=
github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s=
github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f h1:9bQnrEGWfn7f/UmX1lgATRkiPTE1/QNWOPYkuIJrxLE=
github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f/go.mod h1:6/akmgtGHeLs5AsxjT62OlGUT3+o9/QCrQpPP5nSraY=
github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f h1:Ux8BWjqirYvfQpRPJFj4heNaa5QHNLQgIF3EzoM8RBc=
github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8=
github.com/iotaledger/hive.go/kvstore v0.0.0-20231214115948-1e569feb231f h1:mzO5Qn8rh1IvpRtDEfeusen8vZfmXgTl0aRnxBCb8RI=
github.com/iotaledger/hive.go/kvstore v0.0.0-20231214115948-1e569feb231f/go.mod h1:UjkGs5jxiEwIFyzX4wfNk01dHuqDtTOtbzsSqoJR9Pw=
github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f h1:K7ENmrYgz+uhthmUkhrzmwQmTt+0ZFqVBrs8kDpKyBc=
github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f/go.mod h1:sw9SPdK6Jl0wOQ9D/TzT9pFxglnQU54KJcp5r2+BwWc=
github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f h1:24HZVt9j5ghlknqldqjKs5VtLfuQC+AZngo+3HsQYeM=
github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f/go.mod h1:V1z5PzDqvI6obM4RKEVjwMov2Oift2M/8YteR0Q48e0=
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f h1:RlHzFQARwAP8Pnmn/mTTP+UU1Nat/mRjnByE6wPGg20=
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f/go.mod h1:Jx/bQH7XSseyTFIeGF1nhpLWSKRznzmET70/i9mylBw=
github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f h1:iUlHgo4BvGyfBfOhsIvqDKZLN0WCcLaSea+LKY2xIao=
github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs=
github.com/iotaledger/hive.go/constraints v0.0.0-20231223024711-b7560933e508 h1:quwjGf2j0LPyp82FzEQm6uWqGnsDaGqnmCej1PKkUPQ=
github.com/iotaledger/hive.go/constraints v0.0.0-20231223024711-b7560933e508/go.mod h1:dOBOM2s4se3HcWefPe8sQLUalGXJ8yVXw58oK8jke3s=
github.com/iotaledger/hive.go/ds v0.0.0-20231223024711-b7560933e508 h1:0j23oQESh+tJhjVmpfD8hrYw18DRa4hG1+uU7l4VCXY=
github.com/iotaledger/hive.go/ds v0.0.0-20231223024711-b7560933e508/go.mod h1:2LreTPieQaMEhYMZmAfbfIwVKm9+bT7wUC1jsfGvYMU=
github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024711-b7560933e508 h1:U75vU9XO5U+p/A3750Ytft4k2XyVljso19PN1BVMSds=
github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024711-b7560933e508/go.mod h1:HcE8B5lP96enc/OALTb2/rIIi+yOLouRoHOKRclKmC8=
github.com/iotaledger/hive.go/kvstore v0.0.0-20231223024711-b7560933e508 h1:pQwHpY7EyBZ3ZZs7oPsoMjmVS7k/1MEltxC/BGZIaVA=
github.com/iotaledger/hive.go/kvstore v0.0.0-20231223024711-b7560933e508/go.mod h1:ET5O4JuZjsDdyO5DeumF8VKwLascBNdAlmyeXHigD8c=
github.com/iotaledger/hive.go/lo v0.0.0-20231223024711-b7560933e508 h1:XS9n627lFAOJDvV1ktUk/J3aT71OXY+e4pPwM/jiSiQ=
github.com/iotaledger/hive.go/lo v0.0.0-20231223024711-b7560933e508/go.mod h1:w3abvs2FpXLd8rugaTq5YnT4KbniyulhePRU77F5pCg=
github.com/iotaledger/hive.go/runtime v0.0.0-20231223024711-b7560933e508 h1:wNSuoAC6NlDEBlvIfhdwWpEzSWO9QgmXdSfaiYX0Urw=
github.com/iotaledger/hive.go/runtime v0.0.0-20231223024711-b7560933e508/go.mod h1:AzqO/YvIdFTZoK8r9UWHvxrqaWeWxDN+rFf+V7b/6gY=
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024711-b7560933e508 h1:bUBwxhrBHNueGI2ysEJ1yfd+LIoWiJFg4QF9dROOJR8=
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024711-b7560933e508/go.mod h1:LkvNBG7PeoQgCCSB/eMNX8kSHTXtRN10kFciLdMvcgc=
github.com/iotaledger/hive.go/stringify v0.0.0-20231223024711-b7560933e508 h1:9j2zBst8RTXGZIvU9Gk/EQqrzKLgK2UpCJ43K4PQ6y8=
github.com/iotaledger/hive.go/stringify v0.0.0-20231223024711-b7560933e508/go.mod h1:FTo/UWzNYgnQ082GI9QVM9HFDERqf9rw9RivNpqrnTs=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU=
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
Expand All @@ -46,10 +34,6 @@ github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71e
github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
35 changes: 18 additions & 17 deletions app/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,42 @@ go 1.21
require (
github.com/felixge/fgprof v0.9.3
github.com/hashicorp/go-version v1.6.0
github.com/iotaledger/hive.go/ierrors v0.0.0-20231214115948-1e569feb231f
github.com/iotaledger/hive.go/lo v0.0.0-20231214115948-1e569feb231f
github.com/iotaledger/hive.go/log v0.0.0-20231214115948-1e569feb231f
github.com/iotaledger/hive.go/runtime v0.0.0-20231214115948-1e569feb231f
github.com/iotaledger/hive.go/ierrors v0.0.0-20231223024840-2cb11d4a5839
github.com/iotaledger/hive.go/lo v0.0.0-20231223024840-2cb11d4a5839
github.com/iotaledger/hive.go/log v0.0.0-20231223024840-2cb11d4a5839
github.com/iotaledger/hive.go/runtime v0.0.0-20231223024840-2cb11d4a5839
github.com/knadh/koanf v1.5.0
github.com/spf13/cast v1.5.1
github.com/spf13/cast v1.6.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e
go.uber.org/dig v1.17.0
go.uber.org/dig v1.17.1
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ethereum/go-ethereum v1.13.5 // indirect
github.com/ethereum/go-ethereum v1.13.8 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f // indirect
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
github.com/holiman/uint256 v1.2.4 // indirect
github.com/iancoleman/orderedmap v0.3.0 // indirect
github.com/iotaledger/hive.go/constraints v0.0.0-20231214115948-1e569feb231f // indirect
github.com/iotaledger/hive.go/ds v0.0.0-20231214115948-1e569feb231f // indirect
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231214115948-1e569feb231f // indirect
github.com/iotaledger/hive.go/stringify v0.0.0-20231214115948-1e569feb231f // indirect
github.com/iotaledger/hive.go/constraints v0.0.0-20231223024840-2cb11d4a5839 // indirect
github.com/iotaledger/hive.go/ds v0.0.0-20231223024840-2cb11d4a5839 // indirect
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20231223024840-2cb11d4a5839 // indirect
github.com/iotaledger/hive.go/stringify v0.0.0-20231223024840-2cb11d4a5839 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/petermattis/goid v0.0.0-20231126143041-f558c26febf5 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.15.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading