BLS tests: cover both implementations

bls/src/main/java/tech/pegasys/teku/bls/BLS.java

@@ -44,8 +44,19 @@ public class BLS {
 
   private static final Logger LOG = LogManager.getLogger();
 
-  private static final BLS12381 BlsImpl =
-      BlstBLS12381.INSTANCE.map(bls -> (BLS12381) bls).orElse(MikuliBLS12381.INSTANCE);
+  private static BLS12381 BLS_IMPL;
+
+  static {
+    resetBlsImplementation();
+  }
+
+  public static void setBlsImplementation(BLS12381 blsImpl) {
+    BLS_IMPL = blsImpl;
+  }
+
+  public static void resetBlsImplementation() {
+    BLS_IMPL = BlstBLS12381.INSTANCE.map(bls -> (BLS12381) bls).orElse(MikuliBLS12381.INSTANCE);
+  }
 
   /*
    * The following are the methods used directly in the Ethereum 2.0 specifications. These strictly adhere to the standard.
@@ -347,6 +358,6 @@ public static boolean completeBatchVerify(List<BatchSemiAggregate> preparedSigna
   }
 
   static BLS12381 getBlsImpl() {
-    return BlsImpl;
+    return BLS_IMPL;
   }
 }

bls/src/test/java/tech/pegasys/teku/bls/BLSPublicKeyTest.java

@@ -24,9 +24,38 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes48;
 import org.apache.tuweni.ssz.SSZ;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import tech.pegasys.teku.bls.impl.blst.BlstBLS12381;
+import tech.pegasys.teku.bls.impl.mikuli.MikuliBLS12381;
+
+abstract class BLSPublicKeyTest {
+
+  public static class BlstPublicKeyTest extends BLSPublicKeyTest {
+    @BeforeAll
+    public static void init() {
+      BLS.setBlsImplementation(BlstBLS12381.INSTANCE.get());
+    }
+
+    @AfterAll
+    public static void cleanup() {
+      BLS.resetBlsImplementation();
+    }
+  }
+
+  public static class MikuliPublicKeyTest extends BLSPublicKeyTest {
+    @BeforeAll
+    public static void init() {
+      BLS.setBlsImplementation(MikuliBLS12381.INSTANCE);
+    }
+
+    @AfterAll
+    public static void cleanup() {
+      BLS.resetBlsImplementation();
+    }
+  }
 
-class BLSPublicKeyTest {
   private static final Bytes InfinityPublicKey =
       Bytes.fromHexString(
           "0xc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");

bls/src/test/java/tech/pegasys/teku/bls/BLSSecretKeyTest.java

@@ -17,12 +17,40 @@
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.bytes.Bytes48;
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
+import tech.pegasys.teku.bls.impl.blst.BlstBLS12381;
+import tech.pegasys.teku.bls.impl.mikuli.MikuliBLS12381;
 
-public class BLSSecretKeyTest {
+public abstract class BLSSecretKeyTest {
+
+  public static class BlstSecretKeyTest extends BLSSecretKeyTest {
+    @BeforeAll
+    public static void init() {
+      BLS.setBlsImplementation(BlstBLS12381.INSTANCE.get());
+    }
+
+    @AfterAll
+    public static void cleanup() {
+      BLS.resetBlsImplementation();
+    }
+  }
+
+  public static class MikuliSecretKeyTest extends BLSSecretKeyTest {
+    @BeforeAll
+    public static void init() {
+      BLS.setBlsImplementation(MikuliBLS12381.INSTANCE);
+    }
+
+    @AfterAll
+    public static void cleanup() {
+      BLS.resetBlsImplementation();
+    }
+  }
 
   @ParameterizedTest
   @ValueSource(

bls/src/test/java/tech/pegasys/teku/bls/BLSSignatureTest.java

@@ -19,9 +19,37 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.ssz.SSZ;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import tech.pegasys.teku.bls.impl.blst.BlstBLS12381;
+import tech.pegasys.teku.bls.impl.mikuli.MikuliBLS12381;
 
-class BLSSignatureTest {
+abstract class BLSSignatureTest {
+
+  public static class BlstSignatureTest extends BLSSignatureTest {
+    @BeforeAll
+    public static void init() {
+      BLS.setBlsImplementation(BlstBLS12381.INSTANCE.get());
+    }
+
+    @AfterAll
+    public static void cleanup() {
+      BLS.resetBlsImplementation();
+    }
+  }
+
+  public static class MikuliSignatureTest extends BLSSignatureTest {
+    @BeforeAll
+    public static void init() {
+      BLS.setBlsImplementation(MikuliBLS12381.INSTANCE);
+    }
+
+    @AfterAll
+    public static void cleanup() {
+      BLS.resetBlsImplementation();
+    }
+  }
 
   @Test
   void succeedsWhenEqualsReturnsTrueForTheSameEmptySignature() {

bls/src/test/java/tech/pegasys/teku/bls/BLSTest.java

@@ -28,9 +28,37 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.bytes.Bytes48;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import tech.pegasys.teku.bls.impl.blst.BlstBLS12381;
+import tech.pegasys.teku.bls.impl.mikuli.MikuliBLS12381;
 
-class BLSTest {
+public abstract class BLSTest {
+
+  public static class BlstBlsTest extends BLSTest {
+    @BeforeAll
+    public static void init() {
+      BLS.setBlsImplementation(BlstBLS12381.INSTANCE.get());
+    }
+
+    @AfterAll
+    public static void cleanup() {
+      BLS.resetBlsImplementation();
+    }
+  }
+
+  public static class MikuliBlsTest extends BLSTest {
+    @BeforeAll
+    public static void init() {
+      BLS.setBlsImplementation(MikuliBLS12381.INSTANCE);
+    }
+
+    @AfterAll
+    public static void cleanup() {
+      BLS.resetBlsImplementation();
+    }
+  }
 
   @Test
   void succeedsWhenWeCanSignAndVerify() {