From fb4e657949eaa3a6357eb262eb20d37a09d841ab Mon Sep 17 00:00:00 2001
From: Hans Moog <3293976+hmoog@users.noreply.github.com>
Date: Wed, 9 Sep 2020 12:03:30 +0200
Subject: [PATCH] Feat: updated to latest hive.go (#726)
* Feat: updated to latest hive.go
* Fix: started fixing some issued due to the refactor
* Fix: fixed some more issues
Co-authored-by: Hans Moog <hm@mkjc.net>
---
.../packages/branchmanager/objectstorage.go | 8 ++++----
.../packages/tangle/objectstorage.go | 18 +++++++++---------
go.mod | 2 +-
go.sum | 4 ++--
.../messagelayer/tangle/messagemetadata.go | 4 ++--
packages/binary/messagelayer/tangle/tangle.go | 6 +++---
plugins/config/plugin.go | 2 +-
tools/integration-tests/tester/go.mod | 2 +-
tools/integration-tests/tester/go.sum | 4 ++--
9 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/dapps/valuetransfers/packages/branchmanager/objectstorage.go b/dapps/valuetransfers/packages/branchmanager/objectstorage.go
index c9cbfe4a..21cb4d20 100644
--- a/dapps/valuetransfers/packages/branchmanager/objectstorage.go
+++ b/dapps/valuetransfers/packages/branchmanager/objectstorage.go
@@ -48,18 +48,18 @@ var (
}
)
-func osBranchFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osBranchFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return BranchFromStorageKey(key)
}
-func osChildBranchFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osChildBranchFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return ChildBranchFromStorageKey(key)
}
-func osConflictFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osConflictFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return ConflictFromStorageKey(key)
}
-func osConflictMemberFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osConflictMemberFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return ConflictMemberFromStorageKey(key)
}
diff --git a/dapps/valuetransfers/packages/tangle/objectstorage.go b/dapps/valuetransfers/packages/tangle/objectstorage.go
index e7ed0130..593d041c 100644
--- a/dapps/valuetransfers/packages/tangle/objectstorage.go
+++ b/dapps/valuetransfers/packages/tangle/objectstorage.go
@@ -33,38 +33,38 @@ var (
})
)
-func osPayloadFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osPayloadFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return payload.FromStorageKey(key)
}
-func osPayloadMetadataFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osPayloadMetadataFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return PayloadMetadataFromStorageKey(key)
}
-func osMissingPayloadFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osMissingPayloadFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return MissingPayloadFromStorageKey(key)
}
-func osPayloadApproverFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osPayloadApproverFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return PayloadApproverFromStorageKey(key)
}
-func osTransactionFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osTransactionFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return transaction.FromStorageKey(key)
}
-func osTransactionMetadataFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osTransactionMetadataFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return TransactionMetadataFromStorageKey(key)
}
-func osAttachmentFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osAttachmentFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return AttachmentFromStorageKey(key)
}
-func osOutputFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osOutputFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return OutputFromStorageKey(key)
}
-func osConsumerFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func osConsumerFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return ConsumerFromStorageKey(key)
}
diff --git a/go.mod b/go.mod
index e41e5ea1..8e79858b 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
github.com/gobuffalo/packr/v2 v2.8.0
github.com/golang/protobuf v1.4.2
github.com/gorilla/websocket v1.4.2
- github.com/iotaledger/hive.go v0.0.0-20200824153656-adfc839cc240
+ github.com/iotaledger/hive.go v0.0.0-20200909085811-5700df262e21
github.com/labstack/echo v3.3.10+incompatible
github.com/labstack/gommon v0.3.0
github.com/magiconair/properties v1.8.1
diff --git a/go.sum b/go.sum
index 7ca8b298..efba6b5b 100644
--- a/go.sum
+++ b/go.sum
@@ -350,8 +350,8 @@ github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7
github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/iotaledger/hive.go v0.0.0-20200824153656-adfc839cc240 h1:hJFzN7xQhRAut2IQwZVQxVNYztElmlz6OdgPA+IEXXI=
-github.com/iotaledger/hive.go v0.0.0-20200824153656-adfc839cc240/go.mod h1:tLI+HS0amqY5YqClfFZDHlFM7eeIZjoU25Oj1u9jCzQ=
+github.com/iotaledger/hive.go v0.0.0-20200909085811-5700df262e21 h1:ZbVqGAVePnHgTSF4ZuXXH9G+UBQcp1/KUbqpTBMaapg=
+github.com/iotaledger/hive.go v0.0.0-20200909085811-5700df262e21/go.mod h1:tLI+HS0amqY5YqClfFZDHlFM7eeIZjoU25Oj1u9jCzQ=
github.com/iotaledger/iota.go v1.0.0-beta.15 h1:HI8PqerEnO1CCIqmXHJ6zh1IaSFXU+S0qlUAEKshho8=
github.com/iotaledger/iota.go v1.0.0-beta.15/go.mod h1:Rn6v5hLAn8YBaJlRu1ZQdPAgKlshJR1PTeLQaft2778=
github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
diff --git a/packages/binary/messagelayer/tangle/messagemetadata.go b/packages/binary/messagelayer/tangle/messagemetadata.go
index e9ea7126..cea4d89d 100644
--- a/packages/binary/messagelayer/tangle/messagemetadata.go
+++ b/packages/binary/messagelayer/tangle/messagemetadata.go
@@ -45,7 +45,7 @@ func MessageMetadataFromBytes(bytes []byte) (result *MessageMetadata, consumedBy
// Else, delegates to UnmarshalObjectStorageValue.
func ParseMessageMetadata(marshalUtil *marshalutil.MarshalUtil) (result *MessageMetadata, err error) {
parsedObject, parseErr := marshalUtil.Parse(func(data []byte) (interface{}, int, error) {
- return MessageMetadataFromStorageKey(data)
+ return MessageMetadataFromStorageKey(data, nil)
})
if parseErr != nil {
err = parseErr
@@ -62,7 +62,7 @@ func ParseMessageMetadata(marshalUtil *marshalutil.MarshalUtil) (result *Message
}
// MessageMetadataFromStorageKey unmarshals the stored bytes into a MessageMetadata.
-func MessageMetadataFromStorageKey(key []byte) (result objectstorage.StorableObject, consumedBytes int, err error) {
+func MessageMetadataFromStorageKey(key []byte, _ []byte) (result objectstorage.StorableObject, consumedBytes int, err error) {
result = &MessageMetadata{}
marshalUtil := marshalutil.New(key)
diff --git a/packages/binary/messagelayer/tangle/tangle.go b/packages/binary/messagelayer/tangle/tangle.go
index 497eaaa3..6c394ef6 100644
--- a/packages/binary/messagelayer/tangle/tangle.go
+++ b/packages/binary/messagelayer/tangle/tangle.go
@@ -30,15 +30,15 @@ type Tangle struct {
shutdown chan struct{}
}
-func messageFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func messageFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return message.StorableObjectFromKey(key)
}
-func approverFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func approverFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return ApproverFromStorageKey(key)
}
-func missingMessageFactory(key []byte) (objectstorage.StorableObject, int, error) {
+func missingMessageFactory(key []byte, _ []byte) (objectstorage.StorableObject, int, error) {
return MissingMessageFromStorageKey(key)
}
diff --git a/plugins/config/plugin.go b/plugins/config/plugin.go
index 76b2cf7e..94c8f38f 100644
--- a/plugins/config/plugin.go
+++ b/plugins/config/plugin.go
@@ -85,7 +85,7 @@ func fetch(printConfig bool, ignoreSettingsAtPrint ...[]string) error {
_node.AutomaticEnv()
flag.Parse()
- err := parameter.LoadConfigFile(_node, *configDirPath, *configName, true, *skipConfigAvailable)
+ err := parameter.LoadConfigFile(_node, *configDirPath, *configName, flag.CommandLine, *skipConfigAvailable)
if err != nil {
return err
}
diff --git a/tools/integration-tests/tester/go.mod b/tools/integration-tests/tester/go.mod
index 175a1ee1..59217fa2 100644
--- a/tools/integration-tests/tester/go.mod
+++ b/tools/integration-tests/tester/go.mod
@@ -10,7 +10,7 @@ require (
github.com/docker/go-units v0.4.0 // indirect
github.com/drand/drand v1.1.1
github.com/iotaledger/goshimmer v0.1.3
- github.com/iotaledger/hive.go v0.0.0-20200824153656-adfc839cc240
+ github.com/iotaledger/hive.go v0.0.0-20200909085811-5700df262e21
github.com/mr-tron/base58 v1.2.0
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/stretchr/testify v1.6.1
diff --git a/tools/integration-tests/tester/go.sum b/tools/integration-tests/tester/go.sum
index 985e2d40..bcc03477 100644
--- a/tools/integration-tests/tester/go.sum
+++ b/tools/integration-tests/tester/go.sum
@@ -340,8 +340,8 @@ github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7
github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/iotaledger/hive.go v0.0.0-20200824153656-adfc839cc240 h1:hJFzN7xQhRAut2IQwZVQxVNYztElmlz6OdgPA+IEXXI=
-github.com/iotaledger/hive.go v0.0.0-20200824153656-adfc839cc240/go.mod h1:tLI+HS0amqY5YqClfFZDHlFM7eeIZjoU25Oj1u9jCzQ=
+github.com/iotaledger/hive.go v0.0.0-20200909085811-5700df262e21 h1:ZbVqGAVePnHgTSF4ZuXXH9G+UBQcp1/KUbqpTBMaapg=
+github.com/iotaledger/hive.go v0.0.0-20200909085811-5700df262e21/go.mod h1:tLI+HS0amqY5YqClfFZDHlFM7eeIZjoU25Oj1u9jCzQ=
github.com/iotaledger/iota.go v1.0.0-beta.15/go.mod h1:Rn6v5hLAn8YBaJlRu1ZQdPAgKlshJR1PTeLQaft2778=
github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
--
GitLab