Skip to content

Commit 94d1135

Browse files
committed
Resolve merge for testnet3
1 parent f3779c9 commit 94d1135

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

ledger/block/src/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,6 @@ impl<N: Network> Block<N> {
125125
transactions: Transactions<N>,
126126
aborted_transaction_ids: Vec<N::TransactionID>,
127127
) -> Result<Self> {
128-
// Ensure the block contains transactions.
129-
ensure!(
130-
!transactions.is_empty() || !aborted_transaction_ids.is_empty(),
131-
"Cannot create a block with zero transactions"
132-
);
133-
134128
// Ensure the number of transactions is within the allowed range.
135129
if transactions.len() > Transactions::<N>::MAX_TRANSACTIONS {
136130
bail!(

ledger/block/src/verify.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,6 @@ impl<N: Network> Block<N> {
389389
fn verify_transactions(&self) -> Result<()> {
390390
let height = self.height();
391391

392-
// Ensure there are transactions.
393-
ensure!(!self.transactions.is_empty(), "Block {height} must contain at least 1 transaction");
394-
395392
// Ensure the number of transactions is within the allowed range.
396393
if self.transactions.len() > Transactions::<N>::MAX_TRANSACTIONS {
397394
bail!(

0 commit comments

Comments
 (0)