Resolve merge for testnet3

AleoNet · Mar 23, 2024 · 94d1135 · 94d1135
1 parent f3779c9
commit 94d1135
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/ledger/block/src/lib.rs b/ledger/block/src/lib.rs
@@ -125,12 +125,6 @@ impl<N: Network> Block<N> {
         transactions: Transactions<N>,
         aborted_transaction_ids: Vec<N::TransactionID>,
     ) -> Result<Self> {
-        // Ensure the block contains transactions.
-        ensure!(
-            !transactions.is_empty() || !aborted_transaction_ids.is_empty(),
-            "Cannot create a block with zero transactions"
-        );
-
         // Ensure the number of transactions is within the allowed range.
         if transactions.len() > Transactions::<N>::MAX_TRANSACTIONS {
             bail!(

diff --git a/ledger/block/src/verify.rs b/ledger/block/src/verify.rs
@@ -389,9 +389,6 @@ impl<N: Network> Block<N> {
     fn verify_transactions(&self) -> Result<()> {
         let height = self.height();
 
-        // Ensure there are transactions.
-        ensure!(!self.transactions.is_empty(), "Block {height} must contain at least 1 transaction");
-
         // Ensure the number of transactions is within the allowed range.
         if self.transactions.len() > Transactions::<N>::MAX_TRANSACTIONS {
             bail!(