From 3a2fd51f2f92cb96267b7284d389342d89f698ac Mon Sep 17 00:00:00 2001
From: "Johan T. Halseth" <johanth@gmail.com>
Date: Wed, 10 Oct 2018 12:55:14 +0200
Subject: [PATCH] lnd_test+lntest: move copyFile() -> lntest.CopyFile()

---
 lnd_test.go       | 28 ++++------------------------
 lntest/harness.go | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/lnd_test.go b/lnd_test.go
index 719388182..681aa5f2d 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -5522,26 +5522,6 @@ func testMaxPendingChannels(net *lntest.NetworkHarness, t *harnessTest) {
 	}
 }
 
-func copyFile(dest, src string) error {
-	s, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer s.Close()
-
-	d, err := os.Create(dest)
-	if err != nil {
-		return err
-	}
-
-	if _, err := io.Copy(d, s); err != nil {
-		d.Close()
-		return err
-	}
-
-	return d.Close()
-}
-
 // waitForTxInMempool polls until finding one transaction in the provided
 // miner's mempool. An error is returned if *one* transaction isn't found within
 // the given timeout.
@@ -6154,7 +6134,7 @@ func testRevokedCloseRetribution(net *lntest.NetworkHarness, t *harnessTest) {
 	// With the temporary file created, copy Bob's current state into the
 	// temporary file we created above. Later after more updates, we'll
 	// restore this state.
-	if err := copyFile(bobTempDbFile, net.Bob.DBPath()); err != nil {
+	if err := lntest.CopyFile(bobTempDbFile, net.Bob.DBPath()); err != nil {
 		t.Fatalf("unable to copy database files: %v", err)
 	}
 
@@ -6394,7 +6374,7 @@ func testRevokedCloseRetributionZeroValueRemoteOutput(net *lntest.NetworkHarness
 	// With the temporary file created, copy Carol's current state into the
 	// temporary file we created above. Later after more updates, we'll
 	// restore this state.
-	if err := copyFile(carolTempDbFile, carol.DBPath()); err != nil {
+	if err := lntest.CopyFile(carolTempDbFile, carol.DBPath()); err != nil {
 		t.Fatalf("unable to copy database files: %v", err)
 	}
 
@@ -6710,7 +6690,7 @@ func testRevokedCloseRetributionRemoteHodl(net *lntest.NetworkHarness,
 	// With the temporary file created, copy Carol's current state into the
 	// temporary file we created above. Later after more updates, we'll
 	// restore this state.
-	if err := copyFile(carolTempDbFile, carol.DBPath()); err != nil {
+	if err := lntest.CopyFile(carolTempDbFile, carol.DBPath()); err != nil {
 		t.Fatalf("unable to copy database files: %v", err)
 	}
 
@@ -7110,7 +7090,7 @@ func testDataLossProtection(net *lntest.NetworkHarness, t *harnessTest) {
 		// With the temporary file created, copy the current state into
 		// the temporary file we created above. Later after more
 		// updates, we'll restore this state.
-		if err := copyFile(tempDbFile, node.DBPath()); err != nil {
+		if err := lntest.CopyFile(tempDbFile, node.DBPath()); err != nil {
 			t.Fatalf("unable to copy database files: %v", err)
 		}
 
diff --git a/lntest/harness.go b/lntest/harness.go
index 1de4cb8ba..95c8bcd1b 100644
--- a/lntest/harness.go
+++ b/lntest/harness.go
@@ -3,7 +3,9 @@ package lntest
 import (
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
+	"os"
 	"strings"
 	"sync"
 	"time"
@@ -1266,3 +1268,24 @@ func (n *NetworkHarness) sendCoins(ctx context.Context, amt btcutil.Amount,
 	expectedBalance := initialBalance.ConfirmedBalance + int64(amt)
 	return target.WaitForBalance(expectedBalance, true)
 }
+
+// CopyFile copies the file src to dest.
+func CopyFile(dest, src string) error {
+	s, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer s.Close()
+
+	d, err := os.Create(dest)
+	if err != nil {
+		return err
+	}
+
+	if _, err := io.Copy(d, s); err != nil {
+		d.Close()
+		return err
+	}
+
+	return d.Close()
+}