tapchannel: detect both HTLC add types

Since we now have two different candidate types for adding HTLCs, we use
the helper method that checks against both of them.

Author: GeorgeTsagk

tapchannel/commitment.go

@@ -98,12 +98,12 @@ func ComputeView(ourBalance, theirBalance uint64,
 	remoteHtlcIndex := make(map[uint64]lnwallet.AuxHtlcDescriptor)
 
 	for _, entry := range original.Updates.Local {
-		if entry.EntryType == lnwallet.Add {
+		if entry.IsAdd() {
 			localHtlcIndex[entry.HtlcIndex] = entry
 		}
 	}
 	for _, entry := range original.Updates.Remote {
-		if entry.EntryType == lnwallet.Add {
+		if entry.IsAdd() {
 			remoteHtlcIndex[entry.HtlcIndex] = entry
 		}
 	}
@@ -115,6 +115,13 @@ func ComputeView(ourBalance, theirBalance uint64,
 		case lnwallet.Add:
 			continue
 
+		// Skip noop adds, they will also be processed below. This type
+		// of entry only settles the assets and not the sats that carry
+		// them. This is not something we have to worry about here since
+		// we only care about the assets at this point.
+		case lnwallet.NoOpAdd:
+			continue
+
 		// Fee updates don't concern us at the asset level.
 		case lnwallet.FeeUpdate:
 			continue
@@ -162,6 +169,13 @@ func ComputeView(ourBalance, theirBalance uint64,
 		case lnwallet.Add:
 			continue
 
+		// Skip noop adds, they will also be processed below. This type
+		// of entry only settles the assets and not the sats that carry
+		// them. This is not something we have to worry about here since
+		// we only care about the assets at this point.
+		case lnwallet.NoOpAdd:
+			continue
+
 		// Fee updates don't concern us at the asset level.
 		case lnwallet.FeeUpdate:
 			continue
@@ -207,7 +221,7 @@ func ComputeView(ourBalance, theirBalance uint64,
 	// settled HTLCs, and debiting the chain state balance due to any newly
 	// added HTLCs.
 	for _, entry := range original.Updates.Local {
-		isAdd := entry.EntryType == lnwallet.Add
+		isAdd := entry.IsAdd()
 
 		// Skip any entries that aren't adds or adds that were already
 		// settled or failed by a child HTLC entry we processed above.
@@ -249,7 +263,7 @@ func ComputeView(ourBalance, theirBalance uint64,
 		newView.OurUpdates = append(newView.OurUpdates, decodedEntry)
 	}
 	for _, entry := range original.Updates.Remote {
-		isAdd := entry.EntryType == lnwallet.Add
+		isAdd := entry.IsAdd()
 
 		// Skip any entries that aren't adds or adds that were already
 		// settled or failed by a child HTLC entry we processed above.