Merge pull request #342 from chippr-robotics/copilot/un-ignore-test-failures

Investigate 6 ignored test failures from Scala 3 migration

Author: realcodywburns

build.sbt

@@ -284,20 +284,21 @@ lazy val node = {
       (Compile / buildInfoOptions) += BuildInfoOption.ToMap,
       // Temporarily exclude test files with MockFactory compilation issues (Scala 3 migration)
       // These files need additional refactoring to work with Scala 3's MockFactory self-type requirements
+      // Un-ignored 6 priority tests per issue to identify failure causes.
+      // 2 tests fixed and compile successfully: OmmersPoolSpec, RLPxConnectionHandlerSpec
+      // 4 tests have MockBlockchain/MockFactory Scala 3 incompatibility and need architectural changes
       (Test / excludeFilter) := {
         val base = (Test / excludeFilter).value
         base || 
-          "RLPxConnectionHandlerSpec.scala" ||
-          "OmmersPoolSpec.scala" ||
+          "BranchResolutionSpec.scala" ||
           "ConsensusAdapterSpec.scala" ||
           "ConsensusImplSpec.scala" ||
+          "FastSyncBranchResolverActorSpec.scala" ||
           "PoWMiningCoordinatorSpec.scala" ||
           "PoWMiningSpec.scala" ||
           "EthashMinerSpec.scala" ||
           "KeccakMinerSpec.scala" ||
           "MockedMinerSpec.scala" ||
-          "BranchResolutionSpec.scala" ||
-          "FastSyncBranchResolverActorSpec.scala" ||
           "MessageHandlerSpec.scala" ||
           "BlockExecutionSpec.scala" ||
           "QaJRCSpec.scala" ||

src/test/scala/com/chipprbots/ethereum/blockchain/sync/fast/FastSyncBranchResolverActorSpec.scala

@@ -60,7 +60,7 @@ class FastSyncBranchResolverActorSpec
     "fetch headers from the new master peer" - {
       "the chain is repaired from the first request to the new master pair and then the last two blocks are removed" in new TestSetup {
         implicit override lazy val system = self.system
-        implicit val ioRuntime: IORuntime = IORuntime.global
+        implicit override lazy val ioRuntime: IORuntime = IORuntime.global
 
         val sender = TestProbe("sender")
 
@@ -107,7 +107,7 @@ class FastSyncBranchResolverActorSpec
       "The chain is repaired doing binary searching with the new master peer and then remove the last invalid blocks" - {
         "highest common block is in the middle" in new TestSetup {
           implicit override lazy val system = self.system
-          implicit val ioRuntime: IORuntime = IORuntime.global
+          implicit override lazy val ioRuntime: IORuntime = IORuntime.global
 
           val sender = TestProbe("sender")
 
@@ -144,7 +144,7 @@ class FastSyncBranchResolverActorSpec
         }
         "highest common block is in the first half" in new TestSetup {
           implicit override lazy val system = self.system
-          implicit val ioRuntime: IORuntime = IORuntime.global
+          implicit override lazy val ioRuntime: IORuntime = IORuntime.global
 
           val sender = TestProbe("sender")
 
@@ -183,7 +183,7 @@ class FastSyncBranchResolverActorSpec
 
         "highest common block is in the second half" in new TestSetup {
           implicit override lazy val system = self.system
-          implicit val ioRuntime: IORuntime = IORuntime.global
+          implicit override lazy val ioRuntime: IORuntime = IORuntime.global
 
           val sender = TestProbe("sender")
 
@@ -222,7 +222,7 @@ class FastSyncBranchResolverActorSpec
 
       "No common block is found" in new TestSetup {
         implicit override lazy val system = self.system
-        implicit val ioRuntime: IORuntime = IORuntime.global
+        implicit override lazy val ioRuntime: IORuntime = IORuntime.global
 
         val sender = TestProbe("sender")
 

src/test/scala/com/chipprbots/ethereum/consensus/ConsensusAdapterSpec.scala

@@ -544,6 +544,6 @@ class ConsensusAdapterSpec extends AnyFlatSpec with Matchers with ScalaFutures w
     blockchainReader.getBestBlock().get shouldEqual checkpointBlock
   }
 
-  trait ImportBlockTestSetup extends TestSetupWithVmAndValidators with MockBlockchain
+  trait ImportBlockTestSetup extends TestSetupWithVmAndValidators with MockBlockchain with org.scalamock.scalatest.MockFactory
 
 }

src/test/scala/com/chipprbots/ethereum/consensus/ConsensusImplSpec.scala

@@ -86,7 +86,7 @@ object ConsensusImplSpec {
   val initialBestBlock = initialChain.last
 
   abstract class ConsensusSetup {
-    private val testSetup = new EphemBlockchainTestSetup with MockFactory with org.scalatest.TestSuite {
+    private val testSetup = new EphemBlockchainTestSetup with MockFactory {
       override lazy val blockExecution: BlockExecution = stub[BlockExecution]
       (blockExecution
         .executeAndValidateBlocks(_: List[Block], _: ChainWeight)(_: BlockchainConfig))

src/test/scala/com/chipprbots/ethereum/ledger/LedgerTestSetup.scala

@@ -303,8 +303,6 @@ trait TestSetupWithVmAndValidators extends EphemBlockchainTestSetup {
   lazy val blockQueue: BlockQueue
 
   implicit override lazy val ioRuntime: IORuntime = IORuntime.global
-  // Provide runtimeContext as alias for compatibility
-  implicit def runtimeContext: IORuntime = ioRuntime
 
   override lazy val consensusAdapter: ConsensusAdapter = mkConsensus()
 
@@ -434,7 +432,7 @@ trait TestSetupWithVmAndValidators extends EphemBlockchainTestSetup {
       // Using the global IORuntime is appropriate here because, in test scenarios,
       // validation operations do not require a custom runtime with specific threading characteristics.
       // Tests are typically run in isolation, so contention and performance concerns are minimal.
-      runtimeContext
+      ioRuntime
     )
   }
 }
@@ -493,7 +491,7 @@ trait MockBlockchain { self: TestSetupWithVmAndValidators with org.scalamock.sca
     (() => blockchainReader.genesisHeader).expects().returning(header)
 }
 
-trait EphemBlockchain extends TestSetupWithVmAndValidators { self: org.scalamock.scalatest.MockFactory =>
+trait EphemBlockchain extends TestSetupWithVmAndValidators {
   override lazy val blockQueue: BlockQueue = BlockQueue(blockchainReader, SyncConfig(Config.config))
 
   def blockImportWithMockedBlockExecution(blockExecutionMock: BlockExecution): ConsensusAdapter =
@@ -507,7 +505,7 @@ trait CheckpointHelpers {
     new CheckpointBlockGenerator().generate(parent, checkpoint)
 }
 
-trait OmmersTestSetup extends EphemBlockchain { self: org.scalamock.scalatest.MockFactory =>
+trait OmmersTestSetup extends EphemBlockchain {
   object OmmerValidation extends Mocks.MockValidatorsAlwaysSucceed {
     override val ommersValidator: OmmersValidator =
       new StdOmmersValidator(blockHeaderValidator)

src/test/scala/com/chipprbots/ethereum/network/rlpx/RLPxConnectionHandlerSpec.scala

@@ -33,7 +33,7 @@ import com.chipprbots.ethereum.security.SecureRandomBuilder
 import org.scalatest.Ignore
 
 // SCALA 3 MIGRATION: Fixed by creating manual stub implementation for AuthHandshaker
-@Ignore
+// @Ignore - Un-ignored per issue to identify test failures
 class RLPxConnectionHandlerSpec
     extends TestKit(ActorSystem("RLPxConnectionHandlerSpec_System"))
     with AnyFlatSpecLike
@@ -192,8 +192,11 @@ class RLPxConnectionHandlerSpec
     rlpxConnectionParent.expectTerminated(rlpxConnection)
   }
 
+  // SCALA 3 MIGRATION: Removed self-type constraint `this: org.scalamock.scalatest.MockFactory =>`
+  // because Scala 3 doesn't allow instantiating TestSetup with `new TestSetup` when the self-type
+  // is present, even though the outer class (RLPxConnectionHandlerSpec) extends MockFactory.
+  // The mock functionality still works because the outer class provides MockFactory.
   trait TestSetup extends SecureRandomBuilder {
-    this: org.scalamock.scalatest.MockFactory =>
 
     // Mock parameters for RLPxConnectionHandler
     val mockMessageDecoder: MessageDecoder = new MessageDecoder {
@@ -205,13 +208,13 @@ class RLPxConnectionHandlerSpec
     val connection: TestProbe = TestProbe()
     val mockMessageCodec: MessageCodec = mock[MessageCodec]
     val mockHelloExtractor: HelloCodec = mock[HelloCodec]
-    
+
     private def createStubAuthHandshaker(): AuthHandshaker = {
       import java.security.SecureRandom
       import com.chipprbots.ethereum.crypto.generateKeyPair
-      
+
       val sr = new SecureRandom()
-      
+
       AuthHandshaker(
         nodeKey = generateKeyPair(sr),
         nonce = ByteString.empty,
@@ -268,11 +271,21 @@ class RLPxConnectionHandlerSpec
         .expects(data)
         // MIGRATION: Scala 3 requires explicit type ascription for mock with complex parameterized types
         // Create a minimal Secrets instance for test purposes
-        .returning((response, AuthHandshakeSuccess(
-          new Secrets(Array.emptyByteArray, Array.emptyByteArray, Array.emptyByteArray, 
-            new org.bouncycastle.crypto.digests.KeccakDigest(256), 
-            new org.bouncycastle.crypto.digests.KeccakDigest(256)), 
-          ByteString())))
+        .returning(
+          (
+            response,
+            AuthHandshakeSuccess(
+              new Secrets(
+                Array.emptyByteArray,
+                Array.emptyByteArray,
+                Array.emptyByteArray,
+                new org.bouncycastle.crypto.digests.KeccakDigest(256),
+                new org.bouncycastle.crypto.digests.KeccakDigest(256)
+              ),
+              ByteString()
+            )
+          )
+        )
       (mockHelloExtractor.readHello _)
         .expects(ByteString.empty)
         .returning(Some((Hello(5, "", Capability.ETH63 :: Nil, 30303, ByteString("abc")), Seq.empty)))

src/test/scala/com/chipprbots/ethereum/ommers/OmmersPoolSpec.scala

@@ -125,8 +125,11 @@ class OmmersPoolSpec
     }
   }
 
+  // SCALA 3 MIGRATION: Removed self-type constraint `this: org.scalamock.scalatest.MockFactory =>`
+  // because Scala 3 doesn't allow instantiating TestSetup with `new TestSetup` when the self-type
+  // is present, even though the outer class (OmmersPoolSpec) extends MockFactory.
+  // The mock functionality still works because the outer class provides MockFactory.
   trait TestSetup {
-    this: org.scalamock.scalatest.MockFactory =>
 
     // In order to support all the blocks for the given scenarios
     val ommersPoolSize: Int = 8