From d951039dfbcb4fe0035b7dc38af1b0cfb6703a4a Mon Sep 17 00:00:00 2001
From: muXxer <mux3r@web.de>
Date: Mon, 2 Sep 2019 21:55:31 +0200
Subject: [PATCH] Removed badger import in packages and plugins
---
packages/accountability/accountability.go | 6 +++---
packages/database/database.go | 10 +++++++---
plugins/autopeering/saltmanager/saltmanager.go | 4 ++--
plugins/tangle/approvers.go | 6 +++---
plugins/tangle/bundle.go | 6 +++---
plugins/tangle/transaction.go | 6 +++---
plugins/tangle/transaction_metadata.go | 6 +++---
7 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/packages/accountability/accountability.go b/packages/accountability/accountability.go
index e4974c4f..c8d66002 100644
--- a/packages/accountability/accountability.go
+++ b/packages/accountability/accountability.go
@@ -3,7 +3,7 @@ package accountability
import (
"sync"
- "github.com/dgraph-io/badger"
+ "github.com/iotaledger/goshimmer/packages/database"
"github.com/iotaledger/goshimmer/packages/identity"
"github.com/iotaledger/goshimmer/packages/settings"
)
@@ -39,7 +39,7 @@ func generateNewIdentity() *identity.Identity {
func getIdentity() *identity.Identity {
publicKey, err := settings.Get([]byte("ACCOUNTABILITY_PUBLIC_KEY"))
if err != nil {
- if err == badger.ErrKeyNotFound {
+ if err == database.ErrKeyNotFound {
return generateNewIdentity()
} else {
panic(err)
@@ -48,7 +48,7 @@ func getIdentity() *identity.Identity {
privateKey, err := settings.Get([]byte("ACCOUNTABILITY_PRIVATE_KEY"))
if err != nil {
- if err == badger.ErrKeyNotFound {
+ if err == database.ErrKeyNotFound {
return generateNewIdentity()
} else {
panic(err)
diff --git a/packages/database/database.go b/packages/database/database.go
index b69920b9..c8d7ce5a 100644
--- a/packages/database/database.go
+++ b/packages/database/database.go
@@ -6,8 +6,12 @@ import (
"github.com/dgraph-io/badger"
)
-var dbMap = make(map[string]*prefixDb)
-var mu sync.Mutex
+var (
+ ErrKeyNotFound = badger.ErrKeyNotFound
+
+ dbMap = make(map[string]*prefixDb)
+ mu sync.Mutex
+)
type prefixDb struct {
db *badger.DB
@@ -52,7 +56,7 @@ func (this *prefixDb) Contains(key []byte) (bool, error) {
return err
})
- if err == badger.ErrKeyNotFound {
+ if err == ErrKeyNotFound {
return false, nil
} else {
return err == nil, err
diff --git a/plugins/autopeering/saltmanager/saltmanager.go b/plugins/autopeering/saltmanager/saltmanager.go
index 7e250fbd..6cb06a9a 100644
--- a/plugins/autopeering/saltmanager/saltmanager.go
+++ b/plugins/autopeering/saltmanager/saltmanager.go
@@ -3,8 +3,8 @@ package saltmanager
import (
"time"
- "github.com/dgraph-io/badger"
"github.com/iotaledger/goshimmer/packages/daemon"
+ "github.com/iotaledger/goshimmer/packages/database"
"github.com/iotaledger/goshimmer/packages/node"
"github.com/iotaledger/goshimmer/packages/settings"
"github.com/iotaledger/goshimmer/plugins/autopeering/types/salt"
@@ -33,7 +33,7 @@ func generateNewSalt(key []byte, lifetime time.Duration) *salt.Salt {
func getSalt(key []byte, lifetime time.Duration) *salt.Salt {
saltBytes, err := settings.Get(key)
if err != nil {
- if err == badger.ErrKeyNotFound {
+ if err == database.ErrKeyNotFound {
return generateNewSalt(key, lifetime)
} else {
panic(err)
diff --git a/plugins/tangle/approvers.go b/plugins/tangle/approvers.go
index fe4cd677..266649ed 100644
--- a/plugins/tangle/approvers.go
+++ b/plugins/tangle/approvers.go
@@ -1,14 +1,14 @@
package tangle
import (
- "github.com/dgraph-io/badger"
+ "github.com/iotaledger/iota.go/trinary"
+
"github.com/iotaledger/goshimmer/packages/database"
"github.com/iotaledger/goshimmer/packages/datastructure"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/approvers"
"github.com/iotaledger/goshimmer/packages/node"
"github.com/iotaledger/goshimmer/packages/typeutils"
- "github.com/iotaledger/iota.go/trinary"
)
// region global public api ////////////////////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,7 @@ func storeApproversInDatabase(approvers *approvers.Approvers) errors.Identifiabl
func getApproversFromDatabase(transactionHash trinary.Trytes) (*approvers.Approvers, errors.IdentifiableError) {
approversData, err := approversDatabase.Get(typeutils.StringToBytes(transactionHash))
if err != nil {
- if err == badger.ErrKeyNotFound {
+ if err == database.ErrKeyNotFound {
return nil, nil
}
diff --git a/plugins/tangle/bundle.go b/plugins/tangle/bundle.go
index 0351308b..ce3214eb 100644
--- a/plugins/tangle/bundle.go
+++ b/plugins/tangle/bundle.go
@@ -1,14 +1,14 @@
package tangle
import (
- "github.com/dgraph-io/badger"
+ "github.com/iotaledger/iota.go/trinary"
+
"github.com/iotaledger/goshimmer/packages/database"
"github.com/iotaledger/goshimmer/packages/datastructure"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/bundle"
"github.com/iotaledger/goshimmer/packages/node"
"github.com/iotaledger/goshimmer/packages/typeutils"
- "github.com/iotaledger/iota.go/trinary"
)
// region global public api ////////////////////////////////////////////////////////////////////////////////////////////
@@ -103,7 +103,7 @@ func storeBundleInDatabase(bundle *bundle.Bundle) errors.IdentifiableError {
func getBundleFromDatabase(transactionHash trinary.Trytes) (*bundle.Bundle, errors.IdentifiableError) {
bundleData, err := bundleDatabase.Get(typeutils.StringToBytes(transactionHash))
if err != nil {
- if err == badger.ErrKeyNotFound {
+ if err == database.ErrKeyNotFound {
return nil, nil
}
diff --git a/plugins/tangle/transaction.go b/plugins/tangle/transaction.go
index 6242c6e7..100dc66d 100644
--- a/plugins/tangle/transaction.go
+++ b/plugins/tangle/transaction.go
@@ -1,14 +1,14 @@
package tangle
import (
- "github.com/dgraph-io/badger"
+ "github.com/iotaledger/iota.go/trinary"
+
"github.com/iotaledger/goshimmer/packages/database"
"github.com/iotaledger/goshimmer/packages/datastructure"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/value_transaction"
"github.com/iotaledger/goshimmer/packages/node"
"github.com/iotaledger/goshimmer/packages/typeutils"
- "github.com/iotaledger/iota.go/trinary"
)
// region public api ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -100,7 +100,7 @@ func storeTransactionInDatabase(transaction *value_transaction.ValueTransaction)
func getTransactionFromDatabase(transactionHash trinary.Trytes) (*value_transaction.ValueTransaction, errors.IdentifiableError) {
txData, err := transactionDatabase.Get(typeutils.StringToBytes(transactionHash))
if err != nil {
- if err == badger.ErrKeyNotFound {
+ if err == database.ErrKeyNotFound {
return nil, nil
} else {
return nil, ErrDatabaseError.Derive(err, "failed to retrieve transaction")
diff --git a/plugins/tangle/transaction_metadata.go b/plugins/tangle/transaction_metadata.go
index 4f14d635..44cd3cf0 100644
--- a/plugins/tangle/transaction_metadata.go
+++ b/plugins/tangle/transaction_metadata.go
@@ -1,14 +1,14 @@
package tangle
import (
- "github.com/dgraph-io/badger"
+ "github.com/iotaledger/iota.go/trinary"
+
"github.com/iotaledger/goshimmer/packages/database"
"github.com/iotaledger/goshimmer/packages/datastructure"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/transactionmetadata"
"github.com/iotaledger/goshimmer/packages/node"
"github.com/iotaledger/goshimmer/packages/typeutils"
- "github.com/iotaledger/iota.go/trinary"
)
// region public api ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -104,7 +104,7 @@ func storeTransactionMetadataInDatabase(metadata *transactionmetadata.Transactio
func getTransactionMetadataFromDatabase(transactionHash trinary.Trytes) (*transactionmetadata.TransactionMetadata, errors.IdentifiableError) {
txMetadata, err := transactionMetadataDatabase.Get(typeutils.StringToBytes(transactionHash))
if err != nil {
- if err == badger.ErrKeyNotFound {
+ if err == database.ErrKeyNotFound {
return nil, nil
} else {
return nil, ErrDatabaseError.Derive(err, "failed to retrieve transaction")
--
GitLab