reorganize errros (#92)

Signed-off-by: sczembor <[email protected]>

bitcoin/errors.go

@@ -0,0 +1,9 @@
+package bitcoin
+
+import "errors"
+
+// ErrNoBtcConfig is returned when the btc config is missing.
+var ErrNoBtcConfig = errors.New("missing bitcoin node configuration")
+
+// ErrNoNativeProcessor is returned when the btcProcessor is nil.
+var ErrNoBtcProcessor = errors.New("btcProcessor cannot be nil")

dal/errors.go

@@ -0,0 +1,6 @@
+package dal
+
+import "errors"
+
+// ErrNoDB is returned when the database is nil.
+var ErrNoDB = errors.New("database cannot be nil")

ika2btc/processor.go

@@ -10,7 +10,6 @@ import (
 	"github.com/btcsuite/btcd/wire"
 	"github.com/gonative-cc/relayer/bitcoin"
 	"github.com/gonative-cc/relayer/dal"
-	"github.com/gonative-cc/relayer/errors"
 	"github.com/rs/zerolog/log"
 )
 
@@ -29,11 +28,11 @@ func NewProcessor(
 ) (*Processor, error) {
 
 	if db == nil {
-		return nil, errors.ErrNoDB
+		return nil, dal.ErrNoDB
 	}
 
 	if btcClientConfig.Host == "" || btcClientConfig.User == "" || btcClientConfig.Pass == "" {
-		return nil, errors.ErrNoBtcConfig
+		return nil, bitcoin.ErrNoBtcConfig
 	}
 
 	client, err := rpcclient.New(&btcClientConfig, nil)

ika2btc/processor_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/gonative-cc/relayer/bitcoin"
 	"github.com/gonative-cc/relayer/dal"
 	"github.com/gonative-cc/relayer/dal/daltest"
-	"github.com/gonative-cc/relayer/errors"
 	"gotest.tools/v3/assert"
 )
 
@@ -43,14 +42,14 @@ func TestCheckConfirmations(t *testing.T) {
 func TestNewProcessor(t *testing.T) {
 	// missing db
 	processor, err := NewProcessor(btcClientConfig, 6, nil)
-	assert.ErrorIs(t, err, errors.ErrNoDB)
+	assert.ErrorIs(t, err, dal.ErrNoDB)
 	assert.Assert(t, processor == nil)
 
 	// missing BTC config
 	db := daltest.InitTestDB(t)
 	btcClientConfig.Host = ""
 	processor, err = NewProcessor(btcClientConfig, 6, db)
-	assert.ErrorIs(t, err, errors.ErrNoBtcConfig)
+	assert.ErrorIs(t, err, bitcoin.ErrNoBtcConfig)
 	assert.Assert(t, processor == nil)
 }
 

native/errors.go

@@ -0,0 +1,9 @@
+package native
+
+import "errors"
+
+// ErrNoFetcher is returned when the fetcher is nil.
+var ErrNoFetcher = errors.New("sign requests fetcher cannot be nil")
+
+// ErrNoNativeProcessor is returned when the nativeProcessor is nil.
+var ErrNoNativeProcessor = errors.New("nativeProcessor cannot be nil")

nbtc/relayer.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/gonative-cc/relayer/bitcoin"
 	"github.com/gonative-cc/relayer/dal"
-	err "github.com/gonative-cc/relayer/errors"
 	"github.com/gonative-cc/relayer/ika2btc"
 	"github.com/gonative-cc/relayer/native"
 	"github.com/gonative-cc/relayer/native2ika"
@@ -55,19 +55,19 @@ func NewRelayer(
 ) (*Relayer, error) {
 
 	if db == nil {
-		return nil, err.ErrNoDB
+		return nil, dal.ErrNoDB
 	}
 
 	if nativeProcessor == nil {
-		return nil, err.ErrNoNativeProcessor
+		return nil, native.ErrNoNativeProcessor
 	}
 
 	if btcProcessor == nil {
-		return nil, err.ErrNoBtcProcessor
+		return nil, bitcoin.ErrNoBtcProcessor
 	}
 
 	if fetcher == nil {
-		return nil, err.ErrNoFetcher
+		return nil, native.ErrNoFetcher
 	}
 
 	if relayerConfig.ProcessTxsInterval == 0 {

nbtc/relayer_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/gonative-cc/relayer/bitcoin"
 	"github.com/gonative-cc/relayer/dal"
 	"github.com/gonative-cc/relayer/dal/daltest"
-	err "github.com/gonative-cc/relayer/errors"
 	"github.com/gonative-cc/relayer/ika"
 	"github.com/gonative-cc/relayer/ika2btc"
 	"github.com/gonative-cc/relayer/native"
@@ -107,31 +106,31 @@ func TestNewRelayer_ErrorCases(t *testing.T) {
 			db:              nil,
 			nativeProcessor: ts.nativeProcessor,
 			btcProcessor:    ts.btcProcessor,
-			expectedError:   err.ErrNoDB,
+			expectedError:   dal.ErrNoDB,
 			fetcher:         ts.signReqFetcher,
 		},
 		{
 			name:            "NativeProcessorError",
 			db:              ts.db,
 			nativeProcessor: nil,
 			btcProcessor:    ts.btcProcessor,
-			expectedError:   err.ErrNoNativeProcessor,
+			expectedError:   native.ErrNoNativeProcessor,
 			fetcher:         ts.signReqFetcher,
 		},
 		{
 			name:            "BtcProcessorError",
 			db:              ts.db,
 			nativeProcessor: ts.nativeProcessor,
 			btcProcessor:    nil,
-			expectedError:   err.ErrNoBtcProcessor,
+			expectedError:   bitcoin.ErrNoBtcProcessor,
 			fetcher:         ts.signReqFetcher,
 		},
 		{
 			name:            "BlockchainError",
 			db:              ts.db,
 			nativeProcessor: ts.nativeProcessor,
 			btcProcessor:    ts.btcProcessor,
-			expectedError:   err.ErrNoFetcher,
+			expectedError:   native.ErrNoFetcher,
 			fetcher:         nil,
 		},
 	}