Merge pull request #4794 from halseth/bork-channels-revert

htlcswitch/link: revert borking channels on received Errors

htlcswitch/link.go

@@ -1903,7 +1903,14 @@ func (l *channelLink) handleUpstreamMsg(msg lnwire.Message) {
 		l.fail(
 			LinkFailureError{
 				code: ErrRemoteError,
-				PermanentFailure: true,
+
+				// TODO(halseth): we currently don't fail the
+				// channel permanently, as there are some sync
+				// issues with other implementations that will
+				// lead to them sending an error message, but
+				// we can recover from on next connection. See
+				// https://github.com/ElementsProject/lightning/issues/4212
+				PermanentFailure: false,
 			},
 			"ChannelPoint(%v): received error from peer: %v",
 			l.channel.ChannelPoint(), msg.Error(),

htlcswitch/link_test.go

@@ -5273,7 +5273,9 @@ func TestChannelLinkFail(t *testing.T) {
 				c.HandleChannelUpdate(err)
 			},
 			false,
-			true,
+			// TODO(halseth) For compatibility with CL we currently
+			// don't treat Errors as permanent errors.
+			false,
 		},
 	}