Fix failed test caused by channel closed status change

src/fiber/channel.rs

@@ -3504,7 +3504,11 @@ pub enum ChannelState {
 
 impl ChannelState {
     fn is_closed(&self) -> bool {
-        matches!(self, ChannelState::Closed(_))
+        matches!(
+            self,
+            ChannelState::Closed(_)
+                | ChannelState::ShuttingDown(ShuttingDownFlags::WAITING_COMMITMENT_CONFIRMATION)
+        )
     }
 }
 

tests/bruno/e2e/open-use-close-a-channel/21-list-channel-with-closed-status-NODE1.bru

@@ -0,0 +1,54 @@
+meta {
+  name: get channels from node1
+  type: http
+  seq: 21
+}
+
+post {
+  url: {{NODE3_RPC_URL}}
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "id": 42,
+    "jsonrpc": "2.0",
+    "method": "list_channels",
+    "params": [
+      {
+        "peer_id": "{{NODE1_PEERID}}",
+        "include_closed": true
+      }
+    ]
+  }
+}
+
+script:pre-request {
+  await new Promise(r => setTimeout(r, 2000));
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  await new Promise(r => setTimeout(r, 1000));
+  console.log("step 21 list channels: ", res.body.result.channels);
+  // should list all channels including the closed one
+  let channel = res.body.result.channels[0];
+  console.log("channel: ", channel);
+  let expect_channel_id = bru.getVar("CHANNEL_ID");
+  console.log("expect_channel_id: ", expect_channel_id);
+  if (!channel || channel.channel_id != expect_channel_id) {
+    throw new Error("channel not found");
+  }
+  if (channel.state.state_name != "SHUTTING_DOWN" && channel.state.state_flags != "WAITING_COMMITMENT_CONFIRMATION") {
+    throw new Error("channel state is not right");
+  }
+}

tests/bruno/e2e/open-use-close-a-channel/22-generate-a-few-blocks.bru

@@ -0,0 +1,33 @@
+meta {
+  name: generate a few epochs
+  type: http
+  seq: 22
+}
+
+post {
+  url: {{CKB_RPC_URL}}
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "id": 42,
+    "jsonrpc": "2.0",
+    "method": "generate_epochs",
+    "params": ["0x2"]
+  }
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  await new Promise(r => setTimeout(r, 5000));
+}

tests/bruno/e2e/open-use-close-a-channel/23-list-channel-with-closed-status-NODE1.bru

@@ -0,0 +1,54 @@
+meta {
+  name: get channels from node1
+  type: http
+  seq: 23
+}
+
+post {
+  url: {{NODE3_RPC_URL}}
+  body: json
+  auth: none
+}
+
+headers {
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:json {
+  {
+    "id": 42,
+    "jsonrpc": "2.0",
+    "method": "list_channels",
+    "params": [
+      {
+        "peer_id": "{{NODE1_PEERID}}",
+        "include_closed": true
+      }
+    ]
+  }
+}
+
+script:pre-request {
+  await new Promise(r => setTimeout(r, 2000));
+}
+
+assert {
+  res.status: eq 200
+}
+
+script:post-response {
+  await new Promise(r => setTimeout(r, 1000));
+  console.log("step 23 list channels: ", res.body.result.channels);
+  // should list all channels including the closed one
+  let channel = res.body.result.channels[0];
+  console.log("channel: ", channel);
+  let expect_channel_id = bru.getVar("CHANNEL_ID");
+  console.log("expect_channel_id: ", expect_channel_id);
+  if (!channel || channel.channel_id != expect_channel_id) {
+    throw new Error("channel not found");
+  }
+  if (channel.state.state_name != "CLOSED" && channel.state.state_flags != "COOPERATIVE") {
+    throw new Error("channel state is not right");
+  }
+}