From 64bf6f4e26e1a69e261e8412f454f7bc64ebb130 Mon Sep 17 00:00:00 2001
From: yyforyongyu <yy2452@columbia.edu>
Date: Tue, 9 Aug 2022 14:33:15 +0800
Subject: [PATCH] itest: refactor `testBakeMacaroon`

---
 lntest/itest/list_on_test.go          |  4 ++++
 lntest/itest/lnd_macaroons_test.go    | 14 +++++++-------
 lntest/itest/lnd_test_list_on_test.go |  4 ----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lntest/itest/list_on_test.go b/lntest/itest/list_on_test.go
index e445dbe86..90cc6730c 100644
--- a/lntest/itest/list_on_test.go
+++ b/lntest/itest/list_on_test.go
@@ -349,4 +349,8 @@ var allTestCasesTemp = []*lntemp.TestCase{
 		Name:     "macaroon authentication",
 		TestFunc: testMacaroonAuthentication,
 	},
+	{
+		Name:     "bake macaroon",
+		TestFunc: testBakeMacaroon,
+	},
 }
diff --git a/lntest/itest/lnd_macaroons_test.go b/lntest/itest/lnd_macaroons_test.go
index dd28765c3..4739d4626 100644
--- a/lntest/itest/lnd_macaroons_test.go
+++ b/lntest/itest/lnd_macaroons_test.go
@@ -296,8 +296,8 @@ func testMacaroonAuthentication(ht *lntemp.HarnessTest) {
 // testBakeMacaroon checks that when creating macaroons, the permissions param
 // in the request must be set correctly, and the baked macaroon has the intended
 // permissions.
-func testBakeMacaroon(net *lntest.NetworkHarness, t *harnessTest) {
-	var testNode = net.Alice
+func testBakeMacaroon(ht *lntemp.HarnessTest) {
+	var testNode = ht.Alice
 
 	testCases := []struct {
 		name string
@@ -429,7 +429,7 @@ func testBakeMacaroon(net *lntest.NetworkHarness, t *harnessTest) {
 
 			newMac, err := readMacaroonFromHex(bakeResp.Macaroon)
 			require.NoError(t, err)
-			cleanup, readOnlyClient := macaroonClientOld(
+			cleanup, readOnlyClient := macaroonClient(
 				t, testNode, newMac,
 			)
 			defer cleanup()
@@ -498,17 +498,17 @@ func testBakeMacaroon(net *lntest.NetworkHarness, t *harnessTest) {
 
 	for _, tc := range testCases {
 		tc := tc
-		t.t.Run(tc.name, func(tt *testing.T) {
+		ht.Run(tc.name, func(tt *testing.T) {
 			ctxt, cancel := context.WithTimeout(
-				context.Background(), defaultTimeout,
+				ht.Context(), defaultTimeout,
 			)
 			defer cancel()
 
 			adminMac, err := testNode.ReadMacaroon(
-				testNode.AdminMacPath(), defaultTimeout,
+				testNode.Cfg.AdminMacPath, defaultTimeout,
 			)
 			require.NoError(tt, err)
-			cleanup, client := macaroonClientOld(tt, testNode, adminMac)
+			cleanup, client := macaroonClient(tt, testNode, adminMac)
 			defer cleanup()
 
 			tc.run(ctxt, tt, client)
diff --git a/lntest/itest/lnd_test_list_on_test.go b/lntest/itest/lnd_test_list_on_test.go
index bf2f903e5..0e3e78ad0 100644
--- a/lntest/itest/lnd_test_list_on_test.go
+++ b/lntest/itest/lnd_test_list_on_test.go
@@ -52,10 +52,6 @@ var allTestCases = []*testCase{
 		name: "cpfp",
 		test: testCPFP,
 	},
-	{
-		name: "bake macaroon",
-		test: testBakeMacaroon,
-	},
 	{
 		name: "delete macaroon id",
 		test: testDeleteMacaroonID,