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

Update hive.go version #2369

Merged
merged 9 commits into from
Aug 5, 2022
Merged

Update hive.go version #2369

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc31d3b
Update hive.go
piotrm50 Aug 1, 2022
340f909
Merge branch 'develop' into refactor/update-hive
piotrm50 Aug 1, 2022
6cf08ba
Use hive.go from master branch
piotrm50 Aug 4, 2022
9efc2bc
Revert accidental changes.
piotrm50 Aug 4, 2022
dd6963f
Rever one more missed change
piotrm50 Aug 4, 2022
186ca53
Merge branch 'develop' into refactor/update-hive
piotrm50 Aug 4, 2022
743cc47
Fixes
piotrm50 Aug 4, 2022
0ea969d
Fix go sum
piotrm50 Aug 4, 2022
7683422
Fix go sum
piotrm50 Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions client/evilspammer/spammer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/iotaledger/goshimmer/packages/core/ledger/utxo"
"github.com/iotaledger/goshimmer/packages/core/ledger/vm/devnetvm"

"github.com/iotaledger/hive.go/configuration"
"github.com/iotaledger/hive.go/logger"
"github.com/iotaledger/hive.go/types"
"github.com/iotaledger/hive.go/core/configuration"
"github.com/iotaledger/hive.go/core/logger"
"github.com/iotaledger/hive.go/core/types"
"go.uber.org/atomic"
)

Expand Down
4 changes: 2 additions & 2 deletions client/evilwallet/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"sync"
"time"

"github.com/iotaledger/hive.go/identity"
"github.com/iotaledger/hive.go/types/confirmation"
"github.com/iotaledger/hive.go/core/identity"
"github.com/iotaledger/hive.go/core/types/confirmation"

"github.com/iotaledger/goshimmer/client"
"github.com/iotaledger/goshimmer/client/wallet"
Expand Down
2 changes: 1 addition & 1 deletion client/evilwallet/evilscenario.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/mr-tron/base58"
"go.uber.org/atomic"

"github.com/iotaledger/hive.go/types"
"github.com/iotaledger/hive.go/core/types"
)

// The custom conflict in spammer can be provided like this:
Expand Down
4 changes: 2 additions & 2 deletions client/evilwallet/evilwallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

"github.com/cockroachdb/errors"
"github.com/iotaledger/hive.go/identity"
"github.com/iotaledger/hive.go/types"
"github.com/iotaledger/hive.go/core/identity"
"github.com/iotaledger/hive.go/core/types"

"github.com/iotaledger/goshimmer/client/wallet/packages/address"
"github.com/iotaledger/goshimmer/packages/core/ledger/utxo"
Expand Down
2 changes: 1 addition & 1 deletion client/evilwallet/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/cockroachdb/errors"

"github.com/iotaledger/hive.go/types"
"github.com/iotaledger/hive.go/core/types"

"github.com/iotaledger/goshimmer/packages/core/ledger/utxo"
"github.com/iotaledger/goshimmer/packages/core/ledger/vm/devnetvm"
Expand Down
2 changes: 1 addition & 1 deletion client/evilwallet/output_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/cockroachdb/errors"
"github.com/iotaledger/hive.go/types"
"github.com/iotaledger/hive.go/core/types"

"github.com/iotaledger/goshimmer/client/wallet/packages/address"
"github.com/iotaledger/goshimmer/packages/core/ledger/utxo"
Expand Down
4 changes: 2 additions & 2 deletions client/evilwallet/wallets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"sync"

"github.com/cockroachdb/errors"
"github.com/iotaledger/hive.go/generics/lo"
"github.com/iotaledger/hive.go/core/generics/lo"

"github.com/iotaledger/hive.go/types"
"github.com/iotaledger/hive.go/core/types"
"go.uber.org/atomic"

"github.com/iotaledger/goshimmer/client/wallet/packages/address"
Expand Down
2 changes: 1 addition & 1 deletion client/faucet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"

"github.com/cockroachdb/errors"
"github.com/iotaledger/hive.go/identity"
"github.com/iotaledger/hive.go/core/identity"

"github.com/iotaledger/goshimmer/packages/app/faucet"
"github.com/iotaledger/goshimmer/packages/app/jsonmodels"
Expand Down
2 changes: 1 addition & 1 deletion client/firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"

"github.com/cockroachdb/errors"
"github.com/iotaledger/hive.go/identity"
"github.com/iotaledger/hive.go/core/identity"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion client/manualpeering.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"

"github.com/cockroachdb/errors"
"github.com/iotaledger/hive.go/crypto/ed25519"
"github.com/iotaledger/hive.go/core/crypto/ed25519"

"github.com/iotaledger/goshimmer/packages/app/jsonmodels"
"github.com/iotaledger/goshimmer/packages/node/manualpeering"
Expand Down
2 changes: 1 addition & 1 deletion client/wallet/address_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package wallet
import (
"runtime"

"github.com/iotaledger/hive.go/bitmask"
"github.com/iotaledger/hive.go/core/bitmask"

"github.com/iotaledger/goshimmer/client/wallet/packages/address"
"github.com/iotaledger/goshimmer/client/wallet/packages/seed"
Expand Down
4 changes: 2 additions & 2 deletions client/wallet/assetregistry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/capossele/asset-registry/pkg/registryclient"
"github.com/cockroachdb/errors"
"github.com/go-resty/resty/v2"
"github.com/iotaledger/hive.go/marshalutil"
"github.com/iotaledger/hive.go/serix"
"github.com/iotaledger/hive.go/core/marshalutil"
"github.com/iotaledger/hive.go/core/serix"

"github.com/iotaledger/goshimmer/packages/core/ledger/vm/devnetvm"
)
Expand Down
2 changes: 1 addition & 1 deletion client/wallet/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package wallet

import (
"github.com/iotaledger/hive.go/types/confirmation"
"github.com/iotaledger/hive.go/core/types/confirmation"

"github.com/iotaledger/goshimmer/client/wallet/packages/address"
"github.com/iotaledger/goshimmer/packages/core/ledger/utxo"
Expand Down
2 changes: 1 addition & 1 deletion client/wallet/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"time"

"github.com/capossele/asset-registry/pkg/registryservice"
"github.com/iotaledger/hive.go/bitmask"
"github.com/iotaledger/hive.go/core/bitmask"

"github.com/iotaledger/goshimmer/client"
"github.com/iotaledger/goshimmer/client/wallet/packages/seed"
Expand Down
2 changes: 1 addition & 1 deletion client/wallet/packages/address/address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package address

import (
"github.com/iotaledger/hive.go/stringify"
"github.com/iotaledger/hive.go/core/stringify"
"github.com/mr-tron/base58"

"github.com/iotaledger/goshimmer/packages/core/ledger/vm/devnetvm"
Expand Down
2 changes: 1 addition & 1 deletion client/wallet/packages/seed/seed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package seed

import (
"github.com/iotaledger/hive.go/crypto/ed25519"
"github.com/iotaledger/hive.go/core/crypto/ed25519"

"github.com/iotaledger/goshimmer/client/wallet/packages/address"
"github.com/iotaledger/goshimmer/packages/core/ledger/vm/devnetvm"
Expand Down
8 changes: 4 additions & 4 deletions client/wallet/wallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"unsafe"

"github.com/cockroachdb/errors"
"github.com/iotaledger/hive.go/bitmask"
"github.com/iotaledger/hive.go/generics/lo"
"github.com/iotaledger/hive.go/identity"
"github.com/iotaledger/hive.go/marshalutil"
"github.com/iotaledger/hive.go/core/bitmask"
"github.com/iotaledger/hive.go/core/generics/lo"
"github.com/iotaledger/hive.go/core/identity"
"github.com/iotaledger/hive.go/core/marshalutil"
"golang.org/x/crypto/blake2b"

"github.com/iotaledger/goshimmer/client/wallet/packages/address"
Expand Down
2 changes: 1 addition & 1 deletion client/wallet/webconnector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package wallet

import (
"github.com/cockroachdb/errors"
"github.com/iotaledger/hive.go/types/confirmation"
"github.com/iotaledger/hive.go/core/types/confirmation"

"github.com/iotaledger/goshimmer/client"
"github.com/iotaledger/goshimmer/client/wallet/packages/address"
Expand Down
80 changes: 42 additions & 38 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,35 @@ require (
github.com/beevik/ntp v0.3.0
github.com/capossele/asset-registry v0.0.0-20210521112927-c9d6e74574e8
github.com/celestiaorg/smt v0.2.1-0.20220414134126-dba215ccb884
github.com/cockroachdb/errors v1.8.4
github.com/cockroachdb/errors v1.9.0
github.com/gin-gonic/gin v1.7.0
github.com/go-resty/resty/v2 v2.6.0
github.com/gorilla/websocket v1.5.0
github.com/iotaledger/hive.go v0.0.0-20220714132400-7fd91bb37663
github.com/iotaledger/hive.go/core v0.0.0-20220728101531-371ce55139f0
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-20220728101531-371ce55139f0
github.com/labstack/echo v3.3.10+incompatible
github.com/labstack/gommon v0.3.0
github.com/libp2p/go-libp2p v0.15.0
github.com/libp2p/go-libp2p-core v0.9.0
github.com/libp2p/go-yamux/v2 v2.2.0
github.com/magiconair/properties v1.8.1
github.com/magiconair/properties v1.8.6
github.com/markbates/pkger v0.17.1
github.com/mr-tron/base58 v1.2.0
github.com/multiformats/go-multiaddr v0.4.1
github.com/multiformats/go-varint v0.0.6
github.com/panjf2000/ants/v2 v2.4.8
github.com/panjf2000/ants/v2 v2.5.0
github.com/paulbellamy/ratecounter v0.2.0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_golang v1.11.1
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.0
github.com/spf13/viper v1.12.0
github.com/stretchr/testify v1.7.1
gitlab.com/NebulousLabs/merkletree v0.0.0-20200118113624-07fbf710afc4
go.dedis.ch/kyber/v3 v3.0.13
go.uber.org/atomic v1.9.0
go.uber.org/dig v1.14.1
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
google.golang.org/protobuf v1.27.1
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898
google.golang.org/protobuf v1.28.0
gopkg.in/src-d/go-git.v4 v4.13.1
)

Expand All @@ -44,17 +45,17 @@ require (
github.com/aws/aws-sdk-go v1.34.28 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd v0.22.0-beta // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
github.com/cockroachdb/redact v1.0.8 // indirect
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
github.com/cockroachdb/redact v1.1.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/flynn/noise v1.0.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/getsentry/sentry-go v0.12.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-ole/go-ole v1.2.4 // indirect
github.com/go-playground/locales v0.13.0 // indirect
Expand All @@ -78,15 +79,16 @@ require (
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
github.com/jbenet/goprocess v0.1.4 // indirect
github.com/jellydator/ttlcache/v2 v2.11.1 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
github.com/klauspost/compress v1.12.3 // indirect
github.com/klauspost/compress v1.15.4 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/knadh/koanf v1.4.2-0.20220512043835-4112a7258008 // indirect
github.com/koron/go-ssdp v0.0.2 // indirect
github.com/kr/pretty v0.2.1 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.2.0 // indirect
github.com/libp2p/go-addr-util v0.1.0 // indirect
Expand Down Expand Up @@ -122,8 +124,8 @@ require (
github.com/libp2p/go-tcp-transport v0.2.8 // indirect
github.com/libp2p/go-ws-transport v0.5.0 // indirect
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.13 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/miekg/dns v1.1.43 // indirect
Expand All @@ -133,10 +135,10 @@ require (
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/multiformats/go-base32 v0.0.3 // indirect
github.com/multiformats/go-base36 v0.1.0 // indirect
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
Expand All @@ -146,22 +148,24 @@ require (
github.com/multiformats/go-multistream v0.2.2 // indirect
github.com/oasisprotocol/ed25519 v0.0.0-20210505154701-76d8c688d86e // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pelletier/go-toml v1.7.0 // indirect
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
github.com/petermattis/goid v0.0.0-20220512133901-1f93b0c1af58 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.30.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
github.com/spf13/afero v1.3.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/src-d/gcfg v1.4.0 // indirect
github.com/stretchr/objx v0.3.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/ugorji/go/codec v1.1.7 // indirect
Expand All @@ -175,18 +179,18 @@ require (
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
go.dedis.ch/fixbuf v1.0.3 // indirect
go.mongodb.org/mongo-driver v1.5.1 // indirect
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3 // indirect
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/grpc v1.40.0 // indirect
gopkg.in/ini.v1 v1.51.0 // indirect
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
google.golang.org/grpc v1.46.2 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
)
Loading