Remove the enum variant BranchBecomingCanonChain

In tendermint consensus algorithm branch is not allowed so that
Foundry don't have to handle such cases anymore.

Author: HoOngEe

core/src/blockchain/block_info.rs

@@ -1,4 +1,4 @@
-// Copyright 2018 Kodebox, Inc.
+// Copyright 2018-2020 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-use super::route::TreeRoute;
 use crate::views::{BlockView, HeaderView};
 use ctypes::BlockHash;
 use primitives::Bytes;
@@ -28,13 +27,6 @@ pub enum BestBlockChanged {
     },
     /// Nothing changed.
     None,
-    /// It's part of the fork which should become canon chain,
-    /// because its total score is higher than current
-    /// canon chain score.
-    BranchBecomingCanonChain {
-        best_block: Bytes,
-        tree_route: TreeRoute,
-    },
 }
 
 impl BestBlockChanged {
@@ -47,10 +39,6 @@ impl BestBlockChanged {
             BestBlockChanged::CanonChainAppended {
                 best_block,
             } => best_block,
-            BestBlockChanged::BranchBecomingCanonChain {
-                best_block,
-                ..
-            } => best_block,
             BestBlockChanged::None => return None,
         };
 
@@ -67,13 +55,6 @@ pub enum BestHeaderChanged {
     },
     /// Nothing changed.
     None,
-    /// It's part of the fork which should become canon chain,
-    /// because its total score is higher than current
-    /// canon chain score.
-    BranchBecomingCanonChain {
-        best_header: Vec<u8>,
-        tree_route: TreeRoute,
-    },
 }
 
 impl BestHeaderChanged {
@@ -86,10 +67,6 @@ impl BestHeaderChanged {
             BestHeaderChanged::CanonChainAppended {
                 best_header,
             } => best_header,
-            BestHeaderChanged::BranchBecomingCanonChain {
-                best_header,
-                ..
-            } => best_header,
             BestHeaderChanged::None => return None,
         };
 

core/src/blockchain/blockchain.rs

@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Kodebox, Inc.
+// Copyright 2018-2020 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -256,10 +256,15 @@ impl BlockChain {
                 0 => BestBlockChanged::CanonChainAppended {
                     best_block: new_best_block,
                 },
-                _ => BestBlockChanged::BranchBecomingCanonChain {
-                    tree_route: route,
-                    best_block: new_best_block,
-                },
+                _ => {
+                    cerror!(
+                        BLOCKCHAIN,
+                        "Older/Forked block header #{}({}) is inserted as a new block",
+                        new_header.number(),
+                        new_header.hash()
+                    );
+                    BestBlockChanged::None
+                }
             }
         } else {
             BestBlockChanged::None

core/src/blockchain/body_db.rs

@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Kodebox, Inc.
+// Copyright 2018-2020 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -140,11 +140,6 @@ impl BodyDB {
         &self,
         best_block_changed: &BestBlockChanged,
     ) -> HashMap<TxHash, Option<TransactionAddress>> {
-        let block_hash = if let Some(best_block_hash) = best_block_changed.new_best_hash() {
-            best_block_hash
-        } else {
-            return HashMap::new()
-        };
         let block = match best_block_changed.best_block() {
             Some(block) => block,
             None => return HashMap::new(),
@@ -155,27 +150,6 @@ impl BodyDB {
             BestBlockChanged::CanonChainAppended {
                 ..
             } => tx_hash_and_address_entries(best_block_changed.new_best_hash().unwrap(), tx_hashes).collect(),
-            BestBlockChanged::BranchBecomingCanonChain {
-                tree_route,
-                ..
-            } => {
-                let enacted = tree_route.enacted.iter().flat_map(|hash| {
-                    let body = self.block_body(hash).expect("Enacted block must be in database.");
-                    let enacted_tx_hashes = body.transaction_hashes();
-                    tx_hash_and_address_entries(*hash, enacted_tx_hashes)
-                });
-
-                let current_addresses = { tx_hash_and_address_entries(block_hash, tx_hashes) };
-
-                let retracted = tree_route.retracted.iter().flat_map(|hash| {
-                    let body = self.block_body(&hash).expect("Retracted block must be in database.");
-                    let retracted_tx_hashes = body.transaction_hashes().into_iter();
-                    retracted_tx_hashes.map(|hash| (hash, None))
-                });
-
-                // The order here is important! Don't remove transactions if it was part of enacted blocks as well.
-                retracted.chain(enacted).chain(current_addresses).collect()
-            }
             BestBlockChanged::None => HashMap::new(),
         }
     }
@@ -204,26 +178,6 @@ impl BodyDB {
                 Box::new(::std::iter::empty()),
                 Box::new(tracker_and_addresses_entries(block_hash, block.transactions())),
             ),
-            BestBlockChanged::BranchBecomingCanonChain {
-                ref tree_route,
-                ..
-            } => {
-                let enacted = tree_route
-                    .enacted
-                    .iter()
-                    .flat_map(|hash| {
-                        let body = self.block_body(hash).expect("Enacted block must be in database.");
-                        tracker_and_addresses_entries(*hash, body.transactions())
-                    })
-                    .chain(tracker_and_addresses_entries(block_hash, block.transactions()));
-
-                let retracted = tree_route.retracted.iter().flat_map(|hash| {
-                    let body = self.block_body(hash).expect("Retracted block must be in database.");
-                    tracker_and_addresses_entries(*hash, body.transactions())
-                });
-
-                (Box::new(retracted), Box::new(enacted))
-            }
             BestBlockChanged::None => return Default::default(),
         };
 

core/src/blockchain/headerchain.rs

@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Kodebox, Inc.
+// Copyright 2018-2020 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -243,20 +243,6 @@ impl HeaderChain {
                 let best_header_view = HeaderView::new(best_header);
                 hashes.insert(best_header_view.number(), best_header_view.hash());
             }
-            BestHeaderChanged::BranchBecomingCanonChain {
-                tree_route,
-                best_header,
-            } => {
-                let ancestor_number = self.block_number(&tree_route.ancestor).expect("Ancestor always exist in DB");
-                let start_number = ancestor_number + 1;
-
-                for (index, hash) in tree_route.enacted.iter().enumerate() {
-                    hashes.insert(start_number + index as BlockNumber, *hash);
-                }
-
-                let best_header_view = HeaderView::new(best_header);
-                hashes.insert(best_header_view.number(), best_header_view.hash());
-            }
         }
 
         hashes
@@ -321,10 +307,15 @@ impl HeaderChain {
                 0 => BestHeaderChanged::CanonChainAppended {
                     best_header: new_best_header,
                 },
-                _ => BestHeaderChanged::BranchBecomingCanonChain {
-                    tree_route: route,
-                    best_header: new_best_header,
-                },
+                _ => {
+                    cerror!(
+                        HEADERCHAIN,
+                        "Older/Forked block header #{}({}) is inserted as a new block",
+                        new_header.number(),
+                        new_header.hash()
+                    );
+                    BestHeaderChanged::None
+                }
             }
         } else {
             BestHeaderChanged::None

core/src/blockchain/route.rs

@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Kodebox, Inc.
+// Copyright 2018-2020 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -142,19 +142,6 @@ impl ImportRoute {
                 enacted: vec![],
                 omitted,
             },
-            BestBlockChanged::BranchBecomingCanonChain {
-                tree_route,
-                ..
-            } => {
-                let mut enacted = tree_route.enacted.clone();
-                enacted.push(best_block_changed.new_best_hash().unwrap());
-                let retracted = tree_route.retracted.clone();
-                ImportRoute {
-                    retracted,
-                    enacted,
-                    omitted,
-                }
-            }
         }
     }
 
@@ -180,19 +167,6 @@ impl ImportRoute {
                 enacted: vec![],
                 omitted,
             },
-            BestHeaderChanged::BranchBecomingCanonChain {
-                tree_route,
-                ..
-            } => {
-                let mut enacted = tree_route.enacted.clone();
-                enacted.push(best_header_changed.new_best_hash().unwrap());
-                let retracted = tree_route.retracted.clone();
-                ImportRoute {
-                    retracted,
-                    enacted,
-                    omitted,
-                }
-            }
         }
     }