Merge pull request #4113 from eval-exec/exec/drop-deprecated-union-item

molecule: Remove deprecated `SyncMessage` union items.
nervosnetwork · Sep 18, 2023 · 49b05e1 · 49b05e1
2 parents 08afa44 + 36844db
commit 49b05e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 847 deletions.
diff --git a/sync/src/synchronizer/mod.rs b/sync/src/synchronizer/mod.rs
@@ -279,7 +279,6 @@ impl Synchronizer {
                 }
             }
             packed::SyncMessageUnionReader::InIBD(_) => InIBDProcess::new(self, peer, nc).execute(),
-            _ => StatusCode::ProtocolMessageIsMalformed.with_context("unexpected sync message"),
         }
     }
 

diff --git a/util/gen-types/schemas/extensions.mol b/util/gen-types/schemas/extensions.mol
@@ -241,15 +241,11 @@ table BlockFilterCheckPoints {
 /* Types for Network/Sync */
 
 union SyncMessage {
-    GetHeaders,
-    SendHeaders,
-    GetBlocks,
-    SendBlock,
-    SetFilter,
-    AddFilter,
-    ClearFilter,
-    FilteredBlock,
-    InIBD,
+    GetHeaders     : 0,
+    SendHeaders    : 1,
+    GetBlocks      : 2,
+    SendBlock      : 3,
+    InIBD          : 8,
 }
 
 table GetHeaders {
@@ -269,19 +265,6 @@ table SendBlock {
     block:                  Block,
 }
 
-table SetFilter {
-    hash_seed:              Uint32,
-    filter:                 Bytes,
-    num_hashes:             byte,
-}
-
-table AddFilter {
-    filter:                 Bytes,
-}
-
-table ClearFilter {
-}
-
 table FilteredBlock {
     header:                 Header,
     witnesses_root:         Byte32,