Fix: Change network value from mainnet to regtest (#26)

* changed regtest network value from mainnet to regtest

* correct network config returned

* read network from destinations response

* removed config test

Author: tigh-latte

cmd/rest-server/main.go

@@ -63,10 +63,6 @@ func main() {
 		WithLog().
 		WithPayD().
 		Load()
-	// validate the config, fail if it fails.
-	if err := cfg.Validate(); err != nil {
-		log.Fatal(err)
-	}
 	config.SetupLog(cfg.Logging)
 	log.Infof("\n------Environment: %s -----\n", cfg.Server)
 

config/config.go

@@ -2,10 +2,7 @@ package config
 
 import (
 	"fmt"
-	"regexp"
 	"time"
-
-	validator "github.com/theflyingcodr/govalidator"
 )
 
 // Environment variable constants.
@@ -15,7 +12,6 @@ const (
 	EnvServerFQDN           = "server.fqdn"
 	EnvServerSwaggerEnabled = "server.swagger.enabled"
 	EnvEnvironment          = "env.environment"
-	EnvBitcoinNetwork       = "env.bitcoin.network"
 	EnvRegion               = "env.region"
 	EnvVersion              = "env.version"
 	EnvCommit               = "env.commit"
@@ -33,19 +29,6 @@ const (
 	LogWarn  = "warn"
 )
 
-var reNetworks = regexp.MustCompile(`^(regtest|stn|testnet|mainnet)$`)
-
-// NetworkType is used to restrict the networks we can support.
-type NetworkType string
-
-// Supported bitcoin network types.
-const (
-	NetworkRegtest NetworkType = "mainnet"
-	NetworkSTN     NetworkType = "stn"
-	NetworkTestnet NetworkType = "testnet"
-	NetworkMainet  NetworkType = "mainnet"
-)
-
 // Config returns strongly typed config values.
 type Config struct {
 	Logging    *Logging
@@ -54,15 +37,6 @@ type Config struct {
 	PayD       *PayD
 }
 
-// Validate will ensure the config matches certain parameters.
-func (c *Config) Validate() error {
-	vl := validator.New()
-	if c.Deployment != nil {
-		vl = vl.Validate("deployment.network", validator.MatchString(string(c.Deployment.Network), reNetworks))
-	}
-	return vl.Err()
-}
-
 // Deployment contains information relating to the current
 // deployed instance.
 type Deployment struct {
@@ -72,7 +46,6 @@ type Deployment struct {
 	Version     string
 	Commit      string
 	BuildDate   time.Time
-	Network     NetworkType
 }
 
 // IsDev determines if this app is running on a dev environment.

config/config_test.go

@@ -22,7 +22,6 @@ func SetupDefaults() {
 	viper.SetDefault(EnvCommit, "test")
 	viper.SetDefault(EnvVersion, "v0.0.0")
 	viper.SetDefault(EnvBuildDate, time.Now().UTC())
-	viper.SetDefault(EnvBitcoinNetwork, "regtest")
 
 	// Log level defaults
 	viper.SetDefault(EnvLogLevel, "info")

config/defaults.go

@@ -40,7 +40,6 @@ func (v *ViperConfig) WithDeployment(appName string) ConfigurationLoader {
 		Commit:      viper.GetString(EnvCommit),
 		BuildDate:   viper.GetTime(EnvBuildDate),
 		AppName:     appName,
-		Network:     NetworkType(viper.GetString(EnvBitcoinNetwork)),
 	}
 	return v
 }

config/viper.go

@@ -25,6 +25,7 @@ type Destination struct {
 // DestinationResponse is the response for the destinations api.
 type DestinationResponse struct {
 	SPVRequired bool          `json:"spvRequired"`
+	Network     string        `json:"network"`
 	Outputs     []Destination `json:"outputs"`
 	Fees        *bt.FeeQuote  `json:"fees"`
 	CreatedAt   time.Time     `json:"createdAt"`

data/payd/models/payd.go

@@ -67,6 +67,7 @@ func (p *payd) Destinations(ctx context.Context, args p4.PaymentRequestArgs) (*p
 	}
 	dests := &p4.Destinations{
 		SPVRequired: resp.SPVRequired,
+		Network:     resp.Network,
 		Outputs:     make([]p4.Output, 0),
 		Fees:        resp.Fees,
 		CreatedAt:   resp.CreatedAt,

data/payd/payd.go

@@ -27,6 +27,7 @@ type PaymentDestinations struct {
 // Destinations message containing outputs and their fees.
 type Destinations struct {
 	SPVRequired bool
+	Network     string
 	Outputs     []Output
 	Fees        *bt.FeeQuote
 	CreatedAt   time.Time

destinations.go

@@ -50,7 +50,7 @@ func (p *paymentRequest) CreatePaymentRequest(ctx context.Context, args p4.Payme
 	// here we store paymentRef in extended data to allow some validation in payment flow
 	merchant.ExtendedData["paymentReference"] = args.PaymentID
 	return &p4.PaymentRequest{
-		Network:             "mainnet",
+		Network:             dests.Network,
 		SPVRequired:         dests.SPVRequired,
 		Destinations:        p4.PaymentDestinations{Outputs: dests.Outputs},
 		FeeRate:             dests.Fees,