From ae0d5f831d9b8ead4116e7079c1c671d45513d68 Mon Sep 17 00:00:00 2001
From: Hans Moog <hm@mkjc.net>
Date: Wed, 24 Jul 2019 11:47:58 +0200
Subject: [PATCH] Refactor: changed type conversions back to typeutils
---
packages/model/approvers/approvers.go | 5 ++---
packages/model/bundle/bundle.go | 7 +++----
packages/model/transactionmetadata/transactionmetadata.go | 3 +--
plugins/tangle/approvers.go | 8 ++++----
plugins/tangle/bundle.go | 8 ++++----
plugins/tangle/transaction.go | 7 +++----
plugins/tangle/transaction_metadata.go | 7 +++----
7 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/packages/model/approvers/approvers.go b/packages/model/approvers/approvers.go
index 4a15a05c..f885fd6a 100644
--- a/packages/model/approvers/approvers.go
+++ b/packages/model/approvers/approvers.go
@@ -7,7 +7,6 @@ import (
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/typeutils"
- "github.com/iotaledger/goshimmer/packages/unsafeconvert"
"github.com/iotaledger/iota.go/trinary"
)
@@ -70,14 +69,14 @@ func (approvers *Approvers) Marshal() (result []byte) {
binary.BigEndian.PutUint64(result[MARSHALED_APPROVERS_HASHES_COUNT_START:MARSHALED_APPROVERS_HASHES_COUNT_END], uint64(len(approvers.hashes)))
- copy(result[MARSHALED_APPROVERS_HASH_START:MARSHALED_APPROVERS_HASH_END], unsafeconvert.StringToBytes(approvers.hash))
+ copy(result[MARSHALED_APPROVERS_HASH_START:MARSHALED_APPROVERS_HASH_END], typeutils.StringToBytes(approvers.hash))
i := 0
for hash := range approvers.hashes {
var HASH_START = MARSHALED_APPROVERS_HASHES_START + i*(MARSHALED_APPROVERS_HASH_SIZE)
var HASH_END = HASH_START + MARSHALED_APPROVERS_HASH_SIZE
- copy(result[HASH_START:HASH_END], unsafeconvert.StringToBytes(hash))
+ copy(result[HASH_START:HASH_END], typeutils.StringToBytes(hash))
i++
}
diff --git a/packages/model/bundle/bundle.go b/packages/model/bundle/bundle.go
index 3daec8d1..f2db7031 100644
--- a/packages/model/bundle/bundle.go
+++ b/packages/model/bundle/bundle.go
@@ -9,7 +9,6 @@ import (
"github.com/iotaledger/goshimmer/packages/bitutils"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/typeutils"
- "github.com/iotaledger/goshimmer/packages/unsafeconvert"
"github.com/iotaledger/iota.go/trinary"
)
@@ -114,8 +113,8 @@ func (bundle *Bundle) Marshal() (result []byte) {
binary.BigEndian.PutUint64(result[MARSHALED_TRANSACTIONS_COUNT_START:MARSHALED_TRANSACTIONS_COUNT_END], uint64(len(bundle.transactionHashes)))
- copy(result[MARSHALED_HASH_START:MARSHALED_HASH_END], unsafeconvert.StringToBytes(bundle.hash))
- copy(result[MARSHALED_BUNDLE_ESSENCE_HASH_START:MARSHALED_BUNDLE_ESSENCE_HASH_END], unsafeconvert.StringToBytes(bundle.bundleEssenceHash))
+ copy(result[MARSHALED_HASH_START:MARSHALED_HASH_END], typeutils.StringToBytes(bundle.hash))
+ copy(result[MARSHALED_BUNDLE_ESSENCE_HASH_START:MARSHALED_BUNDLE_ESSENCE_HASH_END], typeutils.StringToBytes(bundle.bundleEssenceHash))
var flags bitutils.BitMask
if bundle.isValueBundle {
@@ -128,7 +127,7 @@ func (bundle *Bundle) Marshal() (result []byte) {
var HASH_START = MARSHALED_APPROVERS_HASHES_START + i*(MARSHALED_TRANSACTION_HASH_SIZE)
var HASH_END = HASH_START + MARSHALED_TRANSACTION_HASH_SIZE
- copy(result[HASH_START:HASH_END], unsafeconvert.StringToBytes(hash))
+ copy(result[HASH_START:HASH_END], typeutils.StringToBytes(hash))
i++
}
diff --git a/packages/model/transactionmetadata/transactionmetadata.go b/packages/model/transactionmetadata/transactionmetadata.go
index 3f9e3b3a..6fd4ab4e 100644
--- a/packages/model/transactionmetadata/transactionmetadata.go
+++ b/packages/model/transactionmetadata/transactionmetadata.go
@@ -7,7 +7,6 @@ import (
"github.com/iotaledger/goshimmer/packages/bitutils"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/typeutils"
- "github.com/iotaledger/goshimmer/packages/unsafeconvert"
"github.com/iotaledger/iota.go/trinary"
)
@@ -219,7 +218,7 @@ func (metadata *TransactionMetadata) Marshal() ([]byte, errors.IdentifiableError
metadata.finalizedMutex.RLock()
defer metadata.finalizedMutex.RUnlock()
- copy(marshaledMetadata[MARSHALED_HASH_START:MARSHALED_HASH_END], unsafeconvert.StringToBytes(metadata.hash))
+ copy(marshaledMetadata[MARSHALED_HASH_START:MARSHALED_HASH_END], typeutils.StringToBytes(metadata.hash))
marshaledReceivedTime, err := metadata.receivedTime.MarshalBinary()
if err != nil {
diff --git a/plugins/tangle/approvers.go b/plugins/tangle/approvers.go
index a692092c..fe4cd677 100644
--- a/plugins/tangle/approvers.go
+++ b/plugins/tangle/approvers.go
@@ -7,7 +7,7 @@ import (
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/approvers"
"github.com/iotaledger/goshimmer/packages/node"
- "github.com/iotaledger/goshimmer/packages/unsafeconvert"
+ "github.com/iotaledger/goshimmer/packages/typeutils"
"github.com/iotaledger/iota.go/trinary"
)
@@ -86,7 +86,7 @@ func configureApproversDatabase(plugin *node.Plugin) {
func storeApproversInDatabase(approvers *approvers.Approvers) errors.IdentifiableError {
if approvers.GetModified() {
- if err := approversDatabase.Set(unsafeconvert.StringToBytes(approvers.GetHash()), approvers.Marshal()); err != nil {
+ if err := approversDatabase.Set(typeutils.StringToBytes(approvers.GetHash()), approvers.Marshal()); err != nil {
return ErrDatabaseError.Derive(err, "failed to store approvers")
}
@@ -97,7 +97,7 @@ func storeApproversInDatabase(approvers *approvers.Approvers) errors.Identifiabl
}
func getApproversFromDatabase(transactionHash trinary.Trytes) (*approvers.Approvers, errors.IdentifiableError) {
- approversData, err := approversDatabase.Get(unsafeconvert.StringToBytes(transactionHash))
+ approversData, err := approversDatabase.Get(typeutils.StringToBytes(transactionHash))
if err != nil {
if err == badger.ErrKeyNotFound {
return nil, nil
@@ -115,7 +115,7 @@ func getApproversFromDatabase(transactionHash trinary.Trytes) (*approvers.Approv
}
func databaseContainsApprovers(transactionHash trinary.Trytes) (bool, errors.IdentifiableError) {
- if contains, err := approversDatabase.Contains(unsafeconvert.StringToBytes(transactionHash)); err != nil {
+ if contains, err := approversDatabase.Contains(typeutils.StringToBytes(transactionHash)); err != nil {
return false, ErrDatabaseError.Derive(err, "failed to check if the approvers exists")
} else {
return contains, nil
diff --git a/plugins/tangle/bundle.go b/plugins/tangle/bundle.go
index 759041c4..0351308b 100644
--- a/plugins/tangle/bundle.go
+++ b/plugins/tangle/bundle.go
@@ -7,7 +7,7 @@ import (
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/bundle"
"github.com/iotaledger/goshimmer/packages/node"
- "github.com/iotaledger/goshimmer/packages/unsafeconvert"
+ "github.com/iotaledger/goshimmer/packages/typeutils"
"github.com/iotaledger/iota.go/trinary"
)
@@ -90,7 +90,7 @@ func configureBundleDatabase(plugin *node.Plugin) {
func storeBundleInDatabase(bundle *bundle.Bundle) errors.IdentifiableError {
if bundle.GetModified() {
- if err := bundleDatabase.Set(unsafeconvert.StringToBytes(bundle.GetHash()), bundle.Marshal()); err != nil {
+ if err := bundleDatabase.Set(typeutils.StringToBytes(bundle.GetHash()), bundle.Marshal()); err != nil {
return ErrDatabaseError.Derive(err, "failed to store bundle")
}
@@ -101,7 +101,7 @@ func storeBundleInDatabase(bundle *bundle.Bundle) errors.IdentifiableError {
}
func getBundleFromDatabase(transactionHash trinary.Trytes) (*bundle.Bundle, errors.IdentifiableError) {
- bundleData, err := bundleDatabase.Get(unsafeconvert.StringToBytes(transactionHash))
+ bundleData, err := bundleDatabase.Get(typeutils.StringToBytes(transactionHash))
if err != nil {
if err == badger.ErrKeyNotFound {
return nil, nil
@@ -119,7 +119,7 @@ func getBundleFromDatabase(transactionHash trinary.Trytes) (*bundle.Bundle, erro
}
func databaseContainsBundle(transactionHash trinary.Trytes) (bool, errors.IdentifiableError) {
- if contains, err := bundleDatabase.Contains(unsafeconvert.StringToBytes(transactionHash)); err != nil {
+ if contains, err := bundleDatabase.Contains(typeutils.StringToBytes(transactionHash)); err != nil {
return false, ErrDatabaseError.Derive(err, "failed to check if the bundle exists")
} else {
return contains, nil
diff --git a/plugins/tangle/transaction.go b/plugins/tangle/transaction.go
index b30074ee..6242c6e7 100644
--- a/plugins/tangle/transaction.go
+++ b/plugins/tangle/transaction.go
@@ -8,7 +8,6 @@ import (
"github.com/iotaledger/goshimmer/packages/model/value_transaction"
"github.com/iotaledger/goshimmer/packages/node"
"github.com/iotaledger/goshimmer/packages/typeutils"
- "github.com/iotaledger/goshimmer/packages/unsafeconvert"
"github.com/iotaledger/iota.go/trinary"
)
@@ -88,7 +87,7 @@ func configureTransactionDatabase(plugin *node.Plugin) {
func storeTransactionInDatabase(transaction *value_transaction.ValueTransaction) errors.IdentifiableError {
if transaction.GetModified() {
- if err := transactionDatabase.Set(unsafeconvert.StringToBytes(transaction.GetHash()), transaction.MetaTransaction.GetBytes()); err != nil {
+ if err := transactionDatabase.Set(typeutils.StringToBytes(transaction.GetHash()), transaction.MetaTransaction.GetBytes()); err != nil {
return ErrDatabaseError.Derive(err, "failed to store transaction")
}
@@ -99,7 +98,7 @@ func storeTransactionInDatabase(transaction *value_transaction.ValueTransaction)
}
func getTransactionFromDatabase(transactionHash trinary.Trytes) (*value_transaction.ValueTransaction, errors.IdentifiableError) {
- txData, err := transactionDatabase.Get(unsafeconvert.StringToBytes(transactionHash))
+ txData, err := transactionDatabase.Get(typeutils.StringToBytes(transactionHash))
if err != nil {
if err == badger.ErrKeyNotFound {
return nil, nil
@@ -112,7 +111,7 @@ func getTransactionFromDatabase(transactionHash trinary.Trytes) (*value_transact
}
func databaseContainsTransaction(transactionHash trinary.Trytes) (bool, errors.IdentifiableError) {
- if contains, err := transactionDatabase.Contains(unsafeconvert.StringToBytes(transactionHash)); err != nil {
+ if contains, err := transactionDatabase.Contains(typeutils.StringToBytes(transactionHash)); err != nil {
return contains, ErrDatabaseError.Derive(err, "failed to check if the transaction exists")
} else {
return contains, nil
diff --git a/plugins/tangle/transaction_metadata.go b/plugins/tangle/transaction_metadata.go
index 9387b2e3..4f14d635 100644
--- a/plugins/tangle/transaction_metadata.go
+++ b/plugins/tangle/transaction_metadata.go
@@ -8,7 +8,6 @@ import (
"github.com/iotaledger/goshimmer/packages/model/transactionmetadata"
"github.com/iotaledger/goshimmer/packages/node"
"github.com/iotaledger/goshimmer/packages/typeutils"
- "github.com/iotaledger/goshimmer/packages/unsafeconvert"
"github.com/iotaledger/iota.go/trinary"
)
@@ -91,7 +90,7 @@ func storeTransactionMetadataInDatabase(metadata *transactionmetadata.Transactio
if marshaledMetadata, err := metadata.Marshal(); err != nil {
return err
} else {
- if err := transactionMetadataDatabase.Set(unsafeconvert.StringToBytes(metadata.GetHash()), marshaledMetadata); err != nil {
+ if err := transactionMetadataDatabase.Set(typeutils.StringToBytes(metadata.GetHash()), marshaledMetadata); err != nil {
return ErrDatabaseError.Derive(err, "failed to store transaction metadata")
}
@@ -103,7 +102,7 @@ func storeTransactionMetadataInDatabase(metadata *transactionmetadata.Transactio
}
func getTransactionMetadataFromDatabase(transactionHash trinary.Trytes) (*transactionmetadata.TransactionMetadata, errors.IdentifiableError) {
- txMetadata, err := transactionMetadataDatabase.Get(unsafeconvert.StringToBytes(transactionHash))
+ txMetadata, err := transactionMetadataDatabase.Get(typeutils.StringToBytes(transactionHash))
if err != nil {
if err == badger.ErrKeyNotFound {
return nil, nil
@@ -121,7 +120,7 @@ func getTransactionMetadataFromDatabase(transactionHash trinary.Trytes) (*transa
}
func databaseContainsTransactionMetadata(transactionHash trinary.Trytes) (bool, errors.IdentifiableError) {
- if contains, err := transactionMetadataDatabase.Contains(unsafeconvert.StringToBytes(transactionHash)); err != nil {
+ if contains, err := transactionMetadataDatabase.Contains(typeutils.StringToBytes(transactionHash)); err != nil {
return contains, ErrDatabaseError.Derive(err, "failed to check if the transaction metadata exists")
} else {
return contains, nil
--
GitLab