From 15b95aeae034c95535b2260cb26f0161dc5ff182 Mon Sep 17 00:00:00 2001
From: capossele <angelocapossele@gmail.com>
Date: Fri, 27 Mar 2020 08:50:01 +0000
Subject: [PATCH] :recycle: refactor to latest develop
---
go.sum | 8 --------
packages/binary/drng/dispatcher.go | 2 +-
packages/binary/drng/dispatcher_test.go | 2 +-
packages/binary/drng/payload/header/header.go | 2 +-
packages/binary/drng/payload/header/header_test.go | 2 +-
packages/binary/drng/payload/payload.go | 10 +++++-----
packages/binary/drng/payload/payload_test.go | 2 +-
.../drng/subtypes/collectiveBeacon/payload/payload.go | 8 ++++----
.../subtypes/collectiveBeacon/payload/payload_test.go | 2 +-
plugins/drng/plugin.go | 2 +-
10 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/go.sum b/go.sum
index 44357152..68dd8610 100644
--- a/go.sum
+++ b/go.sum
@@ -66,8 +66,6 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/drand/bls12-381 v0.0.0-20200110233355-faca855b3a67 h1:+zwFBPeS6Tx0ShngG44wyJ8wBh8ENK9upPxN2fE58Uc=
github.com/drand/bls12-381 v0.0.0-20200110233355-faca855b3a67/go.mod h1:HRtP9ULniFcAfoXvSrD5Kebk1e3/g4cvtBfjlT80PuQ=
-github.com/drand/drand v0.5.3 h1:F31WdmVHaBLjOVnN/hOwASekzBppVDI3vTjUGFLyVIg=
-github.com/drand/drand v0.5.3/go.mod h1:j4vfVHjEQI41GOyF7+QtbPl2/oSvcxvYnHXEs24ccv0=
github.com/drand/drand v0.5.4 h1:DyCkE4YHy1klVtu0YgYiYtsryyzyc0x6Y78HM2C9Mws=
github.com/drand/drand v0.5.4/go.mod h1:n9JV/s1TIL/kx/4002pct7qjilbdzScQKVu05IfHf8c=
github.com/drand/kyber v1.0.1-0.20200110225416-8de27ed8c0e2 h1:nbFLFPYXh/vpWg3KeVlnDm5kfbIAPRXNpWNbvJvKMKY=
@@ -162,8 +160,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/iotaledger/hive.go v0.0.0-20200325224052-ac4d38108211 h1:ckZnjlKHCqgsG6jV5EEyI4uSXElOJxLN1fwQHc4r+eM=
github.com/iotaledger/hive.go v0.0.0-20200325224052-ac4d38108211/go.mod h1:EfH+ZcYGFJzzoFpO7NHGi2k7+Xc84ASyp1EwjhI3eJc=
-github.com/iotaledger/hive.go v0.0.0-20200326125723-9ba81bd19b75 h1:oZdDKfciKDJm/txN1/Ax61CCuFyOc7Y7mpMCrrgCVwo=
-github.com/iotaledger/hive.go v0.0.0-20200326125723-9ba81bd19b75/go.mod h1:EfH+ZcYGFJzzoFpO7NHGi2k7+Xc84ASyp1EwjhI3eJc=
github.com/iotaledger/iota.go v1.0.0-beta.9/go.mod h1:F6WBmYd98mVjAmmPVYhnxg8NNIWCjjH8VWT9qvv3Rc8=
github.com/iotaledger/iota.go v1.0.0-beta.14 h1:Oeb28MfBuJEeXcGrLhTCJFtbsnc8y1u7xidsAmiOD5A=
github.com/iotaledger/iota.go v1.0.0-beta.14/go.mod h1:F6WBmYd98mVjAmmPVYhnxg8NNIWCjjH8VWT9qvv3Rc8=
@@ -399,7 +395,6 @@ golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191119213627-4f8c1d86b1ba/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200109152110-61a87790db17/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -427,7 +422,6 @@ golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -506,8 +500,6 @@ google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk
google.golang.org/genproto v0.0.0-20190201180003-4b09977fb922/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f h1:2wh8dWY8959cBGQvk1RD+/eQBgRYYDaZ+hT0/zsARoA=
-google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24 h1:wDju+RU97qa0FZT0QnZDg9Uc2dH0Ql513kFvHocz+WM=
google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
diff --git a/packages/binary/drng/dispatcher.go b/packages/binary/drng/dispatcher.go
index 1d72badc..52ce355b 100644
--- a/packages/binary/drng/dispatcher.go
+++ b/packages/binary/drng/dispatcher.go
@@ -9,8 +9,8 @@ import (
"github.com/iotaledger/goshimmer/packages/binary/drng/subtypes/collectiveBeacon"
"github.com/iotaledger/goshimmer/packages/binary/drng/subtypes/collectiveBeacon/events"
cb "github.com/iotaledger/goshimmer/packages/binary/drng/subtypes/collectiveBeacon/payload"
- "github.com/iotaledger/goshimmer/packages/binary/marshalutil"
"github.com/iotaledger/goshimmer/packages/binary/signature/ed25119"
+ "github.com/iotaledger/hive.go/marshalutil"
)
func (drng *Instance) Dispatch(issuer ed25119.PublicKey, timestamp time.Time, payload *payload.Payload) error {
diff --git a/packages/binary/drng/dispatcher_test.go b/packages/binary/drng/dispatcher_test.go
index 95034380..8c9acaa6 100644
--- a/packages/binary/drng/dispatcher_test.go
+++ b/packages/binary/drng/dispatcher_test.go
@@ -11,8 +11,8 @@ import (
"github.com/iotaledger/goshimmer/packages/binary/drng/subtypes/collectiveBeacon"
"github.com/iotaledger/goshimmer/packages/binary/drng/subtypes/collectiveBeacon/events"
cbPayload "github.com/iotaledger/goshimmer/packages/binary/drng/subtypes/collectiveBeacon/payload"
- "github.com/iotaledger/goshimmer/packages/binary/marshalutil"
"github.com/iotaledger/goshimmer/packages/binary/signature/ed25119"
+ "github.com/iotaledger/hive.go/marshalutil"
"github.com/stretchr/testify/require"
)
diff --git a/packages/binary/drng/payload/header/header.go b/packages/binary/drng/payload/header/header.go
index 789c0a45..7f49d986 100644
--- a/packages/binary/drng/payload/header/header.go
+++ b/packages/binary/drng/payload/header/header.go
@@ -1,7 +1,7 @@
package header
import (
- "github.com/iotaledger/goshimmer/packages/binary/marshalutil"
+ "github.com/iotaledger/hive.go/marshalutil"
)
type Type = byte
diff --git a/packages/binary/drng/payload/header/header_test.go b/packages/binary/drng/payload/header/header_test.go
index b5778db9..12b67104 100644
--- a/packages/binary/drng/payload/header/header_test.go
+++ b/packages/binary/drng/payload/header/header_test.go
@@ -3,7 +3,7 @@ package header
import (
"testing"
- "github.com/iotaledger/goshimmer/packages/binary/marshalutil"
+ "github.com/iotaledger/hive.go/marshalutil"
"github.com/stretchr/testify/require"
)
diff --git a/packages/binary/drng/payload/payload.go b/packages/binary/drng/payload/payload.go
index e0932d4b..0c6117c5 100644
--- a/packages/binary/drng/payload/payload.go
+++ b/packages/binary/drng/payload/payload.go
@@ -4,8 +4,8 @@ import (
"sync"
"github.com/iotaledger/goshimmer/packages/binary/drng/payload/header"
- "github.com/iotaledger/goshimmer/packages/binary/marshalutil"
"github.com/iotaledger/goshimmer/packages/binary/tangle/model/message/payload"
+ "github.com/iotaledger/hive.go/marshalutil"
"github.com/iotaledger/hive.go/stringify"
)
@@ -135,15 +135,15 @@ func (payload *Payload) String() string {
var Type = payload.Type(111)
-func (payload *Payload) GetType() payload.Type {
+func (payload *Payload) Type() payload.Type {
return Type
}
-func (payload *Payload) MarshalBinary() (bytes []byte, err error) {
+func (payload *Payload) Marshal() (bytes []byte, err error) {
return payload.Bytes(), nil
}
-func (payload *Payload) UnmarshalBinary(data []byte) (err error) {
+func (payload *Payload) Unmarshal(data []byte) (err error) {
_, err, _ = FromBytes(data, payload)
return
@@ -152,7 +152,7 @@ func (payload *Payload) UnmarshalBinary(data []byte) (err error) {
func init() {
payload.RegisterType(Type, func(data []byte) (payload payload.Payload, err error) {
payload = &Payload{}
- err = payload.UnmarshalBinary(data)
+ err = payload.Unmarshal(data)
return
})
diff --git a/packages/binary/drng/payload/payload_test.go b/packages/binary/drng/payload/payload_test.go
index 6eb1e844..0d939d96 100644
--- a/packages/binary/drng/payload/payload_test.go
+++ b/packages/binary/drng/payload/payload_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/iotaledger/goshimmer/packages/binary/drng/payload/header"
- "github.com/iotaledger/goshimmer/packages/binary/marshalutil"
+ "github.com/iotaledger/hive.go/marshalutil"
"github.com/stretchr/testify/require"
)
diff --git a/packages/binary/drng/subtypes/collectiveBeacon/payload/payload.go b/packages/binary/drng/subtypes/collectiveBeacon/payload/payload.go
index 4733b3af..02463d9b 100644
--- a/packages/binary/drng/subtypes/collectiveBeacon/payload/payload.go
+++ b/packages/binary/drng/subtypes/collectiveBeacon/payload/payload.go
@@ -7,8 +7,8 @@ import (
drngPayload "github.com/iotaledger/goshimmer/packages/binary/drng/payload"
"github.com/iotaledger/goshimmer/packages/binary/drng/payload/header"
- "github.com/iotaledger/goshimmer/packages/binary/marshalutil"
"github.com/iotaledger/goshimmer/packages/binary/tangle/model/message/payload"
+ "github.com/iotaledger/hive.go/marshalutil"
)
type Payload struct {
@@ -177,15 +177,15 @@ func (payload *Payload) String() string {
// region Payload implementation ///////////////////////////////////////////////////////////////////////////////////////
-func (payload *Payload) GetType() payload.Type {
+func (payload *Payload) Type() payload.Type {
return drngPayload.Type
}
-func (payload *Payload) MarshalBinary() (bytes []byte, err error) {
+func (payload *Payload) Marshal() (bytes []byte, err error) {
return payload.Bytes(), nil
}
-func (payload *Payload) UnmarshalBinary(data []byte) (err error) {
+func (payload *Payload) Unmarshal(data []byte) (err error) {
_, err, _ = FromBytes(data, payload)
return
diff --git a/packages/binary/drng/subtypes/collectiveBeacon/payload/payload_test.go b/packages/binary/drng/subtypes/collectiveBeacon/payload/payload_test.go
index 5f27e035..fc4067c2 100644
--- a/packages/binary/drng/subtypes/collectiveBeacon/payload/payload_test.go
+++ b/packages/binary/drng/subtypes/collectiveBeacon/payload/payload_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/iotaledger/goshimmer/packages/binary/drng/payload/header"
- "github.com/iotaledger/goshimmer/packages/binary/marshalutil"
+ "github.com/iotaledger/hive.go/marshalutil"
"github.com/stretchr/testify/require"
)
diff --git a/plugins/drng/plugin.go b/plugins/drng/plugin.go
index bd8731f3..3e732c13 100644
--- a/plugins/drng/plugin.go
+++ b/plugins/drng/plugin.go
@@ -3,11 +3,11 @@ package drng
import (
"github.com/iotaledger/goshimmer/packages/binary/drng"
"github.com/iotaledger/goshimmer/packages/binary/drng/payload"
- "github.com/iotaledger/goshimmer/packages/binary/marshalutil"
"github.com/iotaledger/goshimmer/packages/binary/tangle/model/message"
"github.com/iotaledger/goshimmer/packages/binary/tangle/model/transactionmetadata"
"github.com/iotaledger/goshimmer/plugins/tangle"
"github.com/iotaledger/hive.go/events"
+ "github.com/iotaledger/hive.go/marshalutil"
"github.com/iotaledger/hive.go/node"
)
--
GitLab