fix integration test

Consensys · Jul 19, 2023 · 52f6da5 · 52f6da5
1 parent cee246e
commit 52f6da5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.../src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultAcceptanceTest.java b/.../src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultAcceptanceTest.java
@@ -18,9 +18,9 @@
 import static org.hamcrest.Matchers.hasSize;
 
 import tech.pegasys.web3signer.dsl.signer.SignerConfigurationBuilder;
-import tech.pegasys.web3signer.dsl.utils.DefaultAzureKeyVaultParameters;
 import tech.pegasys.web3signer.signing.KeyType;
 import tech.pegasys.web3signer.signing.config.AzureKeyVaultParameters;
+import tech.pegasys.web3signer.signing.config.DefaultAzureKeyVaultParameters;
 import tech.pegasys.web3signer.tests.AcceptanceTestBase;
 
 import java.util.Map;

diff --git a/...java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultMultiValueAcceptanceTest.java b/...java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultMultiValueAcceptanceTest.java
@@ -21,9 +21,9 @@
 import tech.pegasys.teku.bls.BLSSecretKey;
 import tech.pegasys.web3signer.BLSTestUtil;
 import tech.pegasys.web3signer.dsl.signer.SignerConfigurationBuilder;
-import tech.pegasys.web3signer.dsl.utils.DefaultAzureKeyVaultParameters;
 import tech.pegasys.web3signer.signing.KeyType;
 import tech.pegasys.web3signer.signing.config.AzureKeyVaultParameters;
+import tech.pegasys.web3signer.signing.config.DefaultAzureKeyVaultParameters;
 import tech.pegasys.web3signer.tests.AcceptanceTestBase;
 
 import java.util.List;

diff --git a/core/build.gradle b/core/build.gradle
@@ -72,6 +72,7 @@ dependencies {
   }
   integrationTestImplementation 'org.awaitility:awaitility'
   integrationTestRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+  integrationTestImplementation (testFixtures(project(":signing")))
 }
 
 processResources {

diff --git a/...ntegrationTest/java/tech/pegasys/web3signer/core/jsonrpcproxy/support/TestEth1Config.java b/...ntegrationTest/java/tech/pegasys/web3signer/core/jsonrpcproxy/support/TestEth1Config.java
@@ -16,6 +16,8 @@
 import tech.pegasys.web3signer.core.config.client.ClientTlsOptions;
 import tech.pegasys.web3signer.core.service.jsonrpc.handlers.signing.ChainIdProvider;
 import tech.pegasys.web3signer.core.service.jsonrpc.handlers.signing.ConfigurationChainId;
+import tech.pegasys.web3signer.signing.config.AzureKeyVaultParameters;
+import tech.pegasys.web3signer.signing.config.DefaultAzureKeyVaultParameters;
 
 import java.time.Duration;
 import java.util.Optional;
@@ -89,4 +91,9 @@ public Optional<ClientTlsOptions> getClientTlsOptions() {
   public ChainIdProvider getChainId() {
     return chainId;
   }
+
+  @Override
+  public AzureKeyVaultParameters getAzureKeyVaultConfig() {
+    return new DefaultAzureKeyVaultParameters("", "", "", "");
+  }
 }
diff --git a/...utils/DefaultAzureKeyVaultParameters.java → ...onfig/DefaultAzureKeyVaultParameters.java b/...utils/DefaultAzureKeyVaultParameters.java → ...onfig/DefaultAzureKeyVaultParameters.java
@@ -10,10 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.web3signer.dsl.utils;
-
-import tech.pegasys.web3signer.signing.config.AzureAuthenticationMode;
-import tech.pegasys.web3signer.signing.config.AzureKeyVaultParameters;
+package tech.pegasys.web3signer.signing.config;
 
 import java.util.Collections;
 import java.util.HashMap;