Merge pull request #1039 from mintlayer/alfie/blockprod-functional-tests

Add Blockprod functional tests

Author: alfiedotwtf

chainstate/src/detail/ban_score.rs

@@ -137,6 +137,7 @@ impl BanScore for ConnectTransactionError {
             ConnectTransactionError::TxVerifierStorage => 0,
             ConnectTransactionError::PoolOwnerRewardCalculationFailed(_, _) => 100,
             ConnectTransactionError::PoolOwnerRewardCannotExceedTotalReward(_, _, _, _) => 100,
+            ConnectTransactionError::UnexpectedPoolId(_, _) => 100,
             ConnectTransactionError::DelegationsRewardSumFailed(_, _) => 100,
             ConnectTransactionError::DelegationRewardOverflow(_, _, _, _) => 100,
             ConnectTransactionError::DistributedDelegationsRewardExceedTotal(_, _, _, _) => 100,

chainstate/tx-verifier/src/transaction_verifier/error.rs

@@ -121,6 +121,8 @@ pub enum ConnectTransactionError {
         "Reward in block {0} for owner of the pool {1} which is {2:?} cannot be bigger than total reward {3:?}"
     )]
     PoolOwnerRewardCannotExceedTotalReward(Id<Block>, PoolId, Amount, Amount),
+    #[error("Unexpected pool id in kernel {0} doesn't match pool id {1}")]
+    UnexpectedPoolId(PoolId, PoolId),
     #[error("Failed to sum block {0} reward for pool {1} delegations")]
     DelegationsRewardSumFailed(Id<Block>, PoolId),
     #[error("Reward for delegation {0} overflowed: {1:?}*{2:?}/{3:?}")]
@@ -280,7 +282,7 @@ pub enum SpendStakeError {
     InvalidBlockRewardOutputType,
     #[error("Stake pool data in kernel doesn't match data in block reward output")]
     StakePoolDataMismatch,
-    #[error("Pool id in kernel {0} doesn't match id in block reward output {1}")]
+    #[error("Pool id in kernel {0} doesn't match the expected pool id {1}")]
     StakePoolIdMismatch(PoolId, PoolId),
     #[error("Consensus PoS error: {0}")]
     ConsensusPoSError(#[from] consensus::ConsensusPoSError),

chainstate/tx-verifier/src/transaction_verifier/mod.rs

@@ -476,8 +476,9 @@ where
                                 ))
                             }
                         } else {
-                            Err(ConnectTransactionError::SpendStakeError(
-                                SpendStakeError::StakePoolIdMismatch(expected_pool_id, *pool_id),
+                            Err(ConnectTransactionError::UnexpectedPoolId(
+                                *pool_id,
+                                expected_pool_id,
                             ))
                         };
                         Some(res)

mempool/src/error/ban_score.rs

@@ -136,6 +136,7 @@ impl MempoolBanScore for ConnectTransactionError {
             ConnectTransactionError::SpendStakeError(_) => 100,
             ConnectTransactionError::PoolOwnerRewardCalculationFailed(_, _) => 100,
             ConnectTransactionError::PoolOwnerRewardCannotExceedTotalReward(_, _, _, _) => 100,
+            ConnectTransactionError::UnexpectedPoolId(_, _) => 100,
             ConnectTransactionError::NotEnoughPledgeToCreateStakePool(_, _, _) => 100,
             ConnectTransactionError::AttemptToCreateStakePoolFromAccounts => 100,
             ConnectTransactionError::AttemptToCreateDelegationFromAccounts => 100,

mempool/src/pool/orphans/detect.rs

@@ -76,6 +76,7 @@ impl OrphanType {
             | CTE::PoolDataNotFound(_)
             | CTE::PoolOwnerRewardCalculationFailed(_, _)
             | CTE::PoolOwnerRewardCannotExceedTotalReward(..)
+            | CTE::UnexpectedPoolId(_, _)
             | CTE::DelegationsRewardSumFailed(..)
             | CTE::DelegationRewardOverflow(..)
             | CTE::DistributedDelegationsRewardExceedTotal(..)