Skip to content

Commit

Permalink
fix on tets
Browse files Browse the repository at this point in the history
  • Loading branch information
Vutov committed Nov 23, 2019
1 parent 833813e commit fff5679
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
20 changes: 10 additions & 10 deletions lntest/bitcoind.go
Expand Up @@ -41,13 +41,13 @@ var _ BackendConfig = (*BitcoindBackendConfig)(nil)
// using this node as a chain backend.
func (b BitcoindBackendConfig) GenArgs() []string {
var args []string
args = append(args, "--bitcoin.node=bitcoind")
args = append(args, fmt.Sprintf("--bitcoind.rpchost=%v", b.rpcHost))
args = append(args, fmt.Sprintf("--bitcoind.rpcuser=%v", b.rpcUser))
args = append(args, fmt.Sprintf("--bitcoind.rpcpass=%v", b.rpcPass))
args = append(args, fmt.Sprintf("--bitcoind.zmqpubrawblock=%v",
args = append(args, "--bitcoingold.node=bgoldd")
args = append(args, fmt.Sprintf("--bitcoingold.rpchost=%v", b.rpcHost))
args = append(args, fmt.Sprintf("--bitcoingold.rpcuser=%v", b.rpcUser))
args = append(args, fmt.Sprintf("--bitcoingold.rpcpass=%v", b.rpcPass))
args = append(args, fmt.Sprintf("--bitcoingold.zmqpubrawblock=%v",
b.zmqBlockPath))
args = append(args, fmt.Sprintf("--bitcoind.zmqpubrawtx=%v",
args = append(args, fmt.Sprintf("--bitcoingold.zmqpubrawtx=%v",
b.zmqTxPath))

return args
Expand All @@ -65,7 +65,7 @@ func (b BitcoindBackendConfig) DisconnectMiner() error {

// Name returns the name of the backend type.
func (b BitcoindBackendConfig) Name() string {
return "bitcoind"
return "bgoldd"
}

// NewBackend starts a bitcoind node and returns a BitoindBackendConfig for
Expand All @@ -81,12 +81,12 @@ func NewBackend(miner string, netParams *chaincfg.Params) (
return nil, nil, err
}

logFile, err := filepath.Abs(logDir + "/bitcoind.log")
logFile, err := filepath.Abs(logDir + "/bgoldd.log")
if err != nil {
return nil, nil, err
}

tempBitcoindDir, err := ioutil.TempDir("", "bitcoind")
tempBitcoindDir, err := ioutil.TempDir("", "bgoldd")
if err != nil {
return nil, nil,
fmt.Errorf("unable to create temp directory: %v", err)
Expand All @@ -98,7 +98,7 @@ func NewBackend(miner string, netParams *chaincfg.Params) (
p2pPort := rand.Int()%(65536-1024) + 1024

bitcoind := exec.Command(
"bitcoind",
"bgoldd",
"-datadir="+tempBitcoindDir,
"-debug",
"-regtest",
Expand Down
18 changes: 9 additions & 9 deletions lntest/btcd.go
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"os"

"github.com/btgsuite/btgd/chaincfg"
"github.com/btgsuite/btgd/btcjson"
"github.com/btgsuite/btgd/chaincfg"
"github.com/btgsuite/btgd/integration/rpctest"
"github.com/btgsuite/btgd/rpcclient"
)
Expand Down Expand Up @@ -44,11 +44,11 @@ var _ BackendConfig = (*BtcdBackendConfig)(nil)
func (b BtcdBackendConfig) GenArgs() []string {
var args []string
encodedCert := hex.EncodeToString(b.rpcConfig.Certificates)
args = append(args, "--bitcoin.node=btcd")
args = append(args, fmt.Sprintf("--btcd.rpchost=%v", b.rpcConfig.Host))
args = append(args, fmt.Sprintf("--btcd.rpcuser=%v", b.rpcConfig.User))
args = append(args, fmt.Sprintf("--btcd.rpcpass=%v", b.rpcConfig.Pass))
args = append(args, fmt.Sprintf("--btcd.rawrpccert=%v", encodedCert))
args = append(args, "--bitcoingold.node=btgd")
args = append(args, fmt.Sprintf("--btgd.rpchost=%v", b.rpcConfig.Host))
args = append(args, fmt.Sprintf("--btgd.rpcuser=%v", b.rpcConfig.User))
args = append(args, fmt.Sprintf("--btgd.rpcpass=%v", b.rpcConfig.Pass))
args = append(args, fmt.Sprintf("--btgd.rawrpccert=%v", encodedCert))

return args
}
Expand All @@ -65,7 +65,7 @@ func (b BtcdBackendConfig) DisconnectMiner() error {

// Name returns the name of the backend type.
func (b BtcdBackendConfig) Name() string {
return "btcd"
return "btgd"
}

// NewBackend starts a new rpctest.Harness and returns a BtcdBackendConfig for
Expand Down Expand Up @@ -102,8 +102,8 @@ func NewBackend(miner string, netParams *chaincfg.Params) (

// After shutting down the chain backend, we'll make a copy of
// the log file before deleting the temporary log dir.
logFile := logDir + "/" + netParams.Name + "/btcd.log"
err := CopyFile("./output_btcd_chainbackend.log", logFile)
logFile := logDir + "/" + netParams.Name + "/btgd.log"
err := CopyFile("./output_btgd_chainbackend.log", logFile)
if err != nil {
fmt.Printf("unable to copy file: %v\n", err)
}
Expand Down
8 changes: 4 additions & 4 deletions lntest/itest/lnd_test.go
Expand Up @@ -27,7 +27,9 @@ import (
"github.com/BTCGPU/lnd/lnrpc/invoicesrpc"
"github.com/BTCGPU/lnd/lnrpc/routerrpc"
"github.com/BTCGPU/lnd/lnrpc/watchtowerrpc"
"github.com/BTCGPU/lnd/lnrpc/wtclientrpc"
"github.com/BTCGPU/lnd/lntest"
"github.com/BTCGPU/lnd/lntest/wait"
"github.com/BTCGPU/lnd/lntypes"
"github.com/BTCGPU/lnd/lnwire"
"github.com/BTCGPU/lnd/routing"
Expand All @@ -40,8 +42,6 @@ import (
btcutil "github.com/btgsuite/btgutil"
"github.com/davecgh/go-spew/spew"
"github.com/go-errors/errors"
"github.com/BTCGPU/lnd/lnrpc/wtclientrpc"
"github.com/BTCGPU/lnd/lntest/wait"
)

var (
Expand Down Expand Up @@ -14584,9 +14584,9 @@ func TestLightningNetworkDaemon(t *testing.T) {
// After shutting down the miner, we'll make a copy of the log
// file before deleting the temporary log dir.
logFile := fmt.Sprintf(
"%s/%s/btcd.log", minerLogDir, harnessNetParams.Name,
"%s/%s/btgd.log", minerLogDir, harnessNetParams.Name,
)
err := lntest.CopyFile("./output_btcd_miner.log", logFile)
err := lntest.CopyFile("./output_btgd_miner.log", logFile)
if err != nil {
fmt.Printf("unable to copy file: %v\n", err)
}
Expand Down
2 changes: 1 addition & 1 deletion lntest/neutrino.go
Expand Up @@ -22,7 +22,7 @@ var _ BackendConfig = (*NeutrinoBackendConfig)(nil)
// using this node as a chain backend.
func (b NeutrinoBackendConfig) GenArgs() []string {
var args []string
args = append(args, "--bitcoin.node=neutrino")
args = append(args, "--bitcoingold.node=neutrino")
args = append(args, "--neutrino.connect="+b.minerAddr)
return args
}
Expand Down
12 changes: 6 additions & 6 deletions lntest/node.go
Expand Up @@ -179,20 +179,20 @@ func (cfg nodeConfig) genArgs() []string {

switch cfg.NetParams {
case &chaincfg.TestNet3Params:
args = append(args, "--bitcoin.testnet")
args = append(args, "--bitcoingold.testnet")
case &chaincfg.SimNetParams:
args = append(args, "--bitcoin.simnet")
args = append(args, "--bitcoingold.simnet")
case &chaincfg.RegressionNetParams:
args = append(args, "--bitcoin.regtest")
args = append(args, "--bitcoingold.regtest")
}

backendArgs := cfg.BackendCfg.GenArgs()
args = append(args, backendArgs...)
args = append(args, "--bitcoin.active")
args = append(args, "--bitcoingold.active")
args = append(args, "--nobootstrap")
args = append(args, "--debuglevel=debug")
args = append(args, "--bitcoin.defaultchanconfs=1")
args = append(args, fmt.Sprintf("--bitcoin.defaultremotedelay=%v", DefaultCSV))
args = append(args, "--bitcoingold.defaultchanconfs=1")
args = append(args, fmt.Sprintf("--bitcoingold.defaultremotedelay=%v", DefaultCSV))
args = append(args, fmt.Sprintf("--rpclisten=%v", cfg.RPCAddr()))
args = append(args, fmt.Sprintf("--restlisten=%v", cfg.RESTAddr()))
args = append(args, fmt.Sprintf("--listen=%v", cfg.P2PAddr()))
Expand Down

0 comments on commit fff5679

Please sign in to comment.