macaroons: replace defer cleanup with t.Cleanup

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>

macaroons/service_test.go

@@ -37,14 +37,17 @@ func setupTestRootKeyStorage(t *testing.T) kvdb.Backend {
 		kvdb.DefaultDBTimeout,
 	)
 	require.NoError(t, err, "Error opening store DB")
+	t.Cleanup(func() {
+		require.NoError(t, db.Close())
+	})
+
 	store, err := macaroons.NewRootKeyStorage(db)
-	if err != nil {
+	require.NoError(t, err, "Error creating root key store")
-		db.Close()
+
-		t.Fatalf("Error creating root key store: %v", err)
-	}
-	defer store.Close()
 	err = store.CreateUnlock(&defaultPw)
+	require.NoError(t, store.Close())
 	require.NoError(t, err, "error creating unlock")
+
 	return db
 }