From 4b469eb0c571139a344372503eaefcbfe0a79b52 Mon Sep 17 00:00:00 2001
From: yyforyongyu <yy2452@columbia.edu>
Date: Tue, 9 Aug 2022 14:35:45 +0800
Subject: [PATCH] itest: refactor `testDeleteMacaroonID`

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

diff --git a/lntest/itest/list_on_test.go b/lntest/itest/list_on_test.go
index 90cc6730c..2bbabf2ef 100644
--- a/lntest/itest/list_on_test.go
+++ b/lntest/itest/list_on_test.go
@@ -353,4 +353,8 @@ var allTestCasesTemp = []*lntemp.TestCase{
 		Name:     "bake macaroon",
 		TestFunc: testBakeMacaroon,
 	},
+	{
+		Name:     "delete macaroon id",
+		TestFunc: testDeleteMacaroonID,
+	},
 }
diff --git a/lntest/itest/lnd_macaroons_test.go b/lntest/itest/lnd_macaroons_test.go
index 4739d4626..3622c6ba2 100644
--- a/lntest/itest/lnd_macaroons_test.go
+++ b/lntest/itest/lnd_macaroons_test.go
@@ -520,26 +520,26 @@ func testBakeMacaroon(ht *lntemp.HarnessTest) {
 // specified ID and invalidates all macaroons derived from the key with that ID.
 // Also, it checks deleting the reserved marcaroon ID, DefaultRootKeyID or is
 // forbidden.
-func testDeleteMacaroonID(net *lntest.NetworkHarness, t *harnessTest) {
+func testDeleteMacaroonID(ht *lntemp.HarnessTest) {
 	var (
-		ctxb     = context.Background()
-		testNode = net.Alice
+		ctxb     = ht.Context()
+		testNode = ht.Alice
 	)
 	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
 	defer cancel()
 
 	// Use admin macaroon to create a connection.
 	adminMac, err := testNode.ReadMacaroon(
-		testNode.AdminMacPath(), defaultTimeout,
+		testNode.Cfg.AdminMacPath, defaultTimeout,
 	)
-	require.NoError(t.t, err)
-	cleanup, client := macaroonClientOld(t.t, testNode, adminMac)
+	require.NoError(ht, err)
+	cleanup, client := macaroonClient(ht.T, testNode, adminMac)
 	defer cleanup()
 
 	// Record the number of macaroon IDs before creation.
 	listReq := &lnrpc.ListMacaroonIDsRequest{}
 	listResp, err := client.ListMacaroonIDs(ctxt, listReq)
-	require.NoError(t.t, err)
+	require.NoError(ht, err)
 	numMacIDs := len(listResp.RootKeyIds)
 
 	// Create macaroons for testing.
@@ -554,17 +554,17 @@ func testDeleteMacaroonID(net *lntest.NetworkHarness, t *harnessTest) {
 			}},
 		}
 		resp, err := client.BakeMacaroon(ctxt, req)
-		require.NoError(t.t, err)
+		require.NoError(ht, err)
 		macList = append(macList, resp.Macaroon)
 	}
 
 	// Check that the creation is successful.
 	listReq = &lnrpc.ListMacaroonIDsRequest{}
 	listResp, err = client.ListMacaroonIDs(ctxt, listReq)
-	require.NoError(t.t, err)
+	require.NoError(ht, err)
 
 	// The number of macaroon IDs should be increased by len(rootKeyIDs).
-	require.Equal(t.t, numMacIDs+len(rootKeyIDs), len(listResp.RootKeyIds))
+	require.Equal(ht, numMacIDs+len(rootKeyIDs), len(listResp.RootKeyIds))
 
 	// First test: check deleting the DefaultRootKeyID returns an error.
 	defaultID, _ := strconv.ParseUint(
@@ -574,38 +574,38 @@ func testDeleteMacaroonID(net *lntest.NetworkHarness, t *harnessTest) {
 		RootKeyId: defaultID,
 	}
 	_, err = client.DeleteMacaroonID(ctxt, req)
-	require.Error(t.t, err)
-	require.Contains(
-		t.t, err.Error(), macaroons.ErrDeletionForbidden.Error(),
-	)
+	require.Error(ht, err)
+	require.Contains(ht, err.Error(),
+		macaroons.ErrDeletionForbidden.Error())
 
 	// Second test: check deleting the customized ID returns success.
 	req = &lnrpc.DeleteMacaroonIDRequest{
 		RootKeyId: rootKeyIDs[0],
 	}
 	resp, err := client.DeleteMacaroonID(ctxt, req)
-	require.NoError(t.t, err)
-	require.True(t.t, resp.Deleted)
+	require.NoError(ht, err)
+	require.True(ht, resp.Deleted)
 
 	// Check that the deletion is successful.
 	listReq = &lnrpc.ListMacaroonIDsRequest{}
 	listResp, err = client.ListMacaroonIDs(ctxt, listReq)
-	require.NoError(t.t, err)
+	require.NoError(ht, err)
 
 	// The number of macaroon IDs should be decreased by 1.
-	require.Equal(t.t, numMacIDs+len(rootKeyIDs)-1, len(listResp.RootKeyIds))
+	require.Equal(ht, numMacIDs+len(rootKeyIDs)-1, len(listResp.RootKeyIds))
 
 	// Check that the deleted macaroon can no longer access macaroon:read.
 	deletedMac, err := readMacaroonFromHex(macList[0])
-	require.NoError(t.t, err)
-	cleanup, client = macaroonClientOld(t.t, testNode, deletedMac)
+	require.NoError(ht, err)
+	cleanup, client = macaroonClient(ht.T, testNode, deletedMac)
 	defer cleanup()
 
-	// Because the macaroon is deleted, it will be treated as an invalid one.
+	// Because the macaroon is deleted, it will be treated as an invalid
+	// one.
 	listReq = &lnrpc.ListMacaroonIDsRequest{}
 	_, err = client.ListMacaroonIDs(ctxt, listReq)
-	require.Error(t.t, err)
-	require.Contains(t.t, err.Error(), "cannot get macaroon")
+	require.Error(ht, err)
+	require.Contains(ht, err.Error(), "cannot get macaroon")
 }
 
 // testStatelessInit checks that the stateless initialization of the daemon
diff --git a/lntest/itest/lnd_test_list_on_test.go b/lntest/itest/lnd_test_list_on_test.go
index 0e3e78ad0..ba81d5864 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: "delete macaroon id",
-		test: testDeleteMacaroonID,
-	},
 	{
 		name: "psbt channel funding",
 		test: testPsbtChanFunding,