From f55b101151da02e8daa7514e865dcdb88f142737 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Fri, 8 Jul 2022 12:38:18 +0200
Subject: [PATCH] clean

---
 htlcInterceptor.go | 12 +++++++-----
 main.go            | 31 -------------------------------
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/htlcInterceptor.go b/htlcInterceptor.go
index e7c4d8f..648c523 100644
--- a/htlcInterceptor.go
+++ b/htlcInterceptor.go
@@ -11,15 +11,16 @@ import (
 )
 
 func dispatchHTLCAcceptor(ctx context.Context, conn *grpc.ClientConn, client lnrpc.LightningClient) {
-	// htlc event subscriber, reports on incoming htlc events
 	router := routerrpc.NewRouterClient(conn)
+
+	// htlc event subscriber, reports on incoming htlc events
 	stream, err := router.SubscribeHtlcEvents(ctx, &routerrpc.SubscribeHtlcEventsRequest{})
 	if err != nil {
 		return
 	}
 
 	go func() {
-		err := processHtlcEvents(stream)
+		err := logHtlcEvents(stream)
 		if err != nil {
 			log.Error("htlc events error",
 				"err", err)
@@ -33,7 +34,7 @@ func dispatchHTLCAcceptor(ctx context.Context, conn *grpc.ClientConn, client lnr
 	}
 
 	go func() {
-		err := processInterceptor(interceptor)
+		err := interceptHtlcEvents(interceptor)
 		if err != nil {
 			log.Error("interceptor error",
 				"err", err)
@@ -43,13 +44,14 @@ func dispatchHTLCAcceptor(ctx context.Context, conn *grpc.ClientConn, client lnr
 	log.Info("Listening for incoming HTLCs")
 }
 
-func processHtlcEvents(stream routerrpc.Router_SubscribeHtlcEventsClient) error {
+func logHtlcEvents(stream routerrpc.Router_SubscribeHtlcEventsClient) error {
 	for {
 		event, err := stream.Recv()
 		if err != nil {
 			return err
 		}
 
+		// we only care about HTLC forward events
 		if event.EventType != routerrpc.HtlcEvent_FORWARD {
 			continue
 		}
@@ -71,7 +73,7 @@ func processHtlcEvents(stream routerrpc.Router_SubscribeHtlcEventsClient) error
 	}
 }
 
-func processInterceptor(interceptor routerrpc.Router_HtlcInterceptorClient) error {
+func interceptHtlcEvents(interceptor routerrpc.Router_HtlcInterceptorClient) error {
 	for {
 		event, err := interceptor.Recv()
 		if err != nil {
diff --git a/main.go b/main.go
index bce388d..245d028 100644
--- a/main.go
+++ b/main.go
@@ -76,37 +76,6 @@ func main() {
 	// htlc acceptor
 	go dispatchHTLCAcceptor(ctx, conn, client)
 
-	// // htlc event subscriber, reports on incoming htlc events
-	// router := routerrpc.NewRouterClient(conn)
-	// stream, err := router.SubscribeHtlcEvents(ctx, &routerrpc.SubscribeHtlcEventsRequest{})
-	// if err != nil {
-	// 	return
-	// }
-
-	// go func() {
-	// 	err := processHtlcEvents(stream)
-	// 	if err != nil {
-	// 		log.Error("htlc events error",
-	// 			"err", err)
-	// 	}
-	// }()
-
-	// // interceptor, decide whether to accept or reject
-	// interceptor, err := router.HtlcInterceptor(ctx)
-	// if err != nil {
-	// 	return
-	// }
-
-	// log.Info("HTLC Interceptor registered")
-
-	// go func() {
-	// 	err := processInterceptor(interceptor)
-	// 	if err != nil {
-	// 		log.Error("interceptor error",
-	// 			"err", err)
-	// 	}
-	// }()
-
 	wg.Wait()
 
 }