From a6e0fa1a03a30f56919bd077bfa34ff9c39c7cd1 Mon Sep 17 00:00:00 2001
From: MiroslavStefanovic <mstef@uns.ac.rs>
Date: Wed, 22 Jan 2025 15:50:17 +0100
Subject: [PATCH] additional fix

---
 contracts/interfaces/IGatewayStructs.sol |  1 +
 test/fixtures.ts                         | 18 +++++-------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/contracts/interfaces/IGatewayStructs.sol b/contracts/interfaces/IGatewayStructs.sol
index 3019644..3e161da 100644
--- a/contracts/interfaces/IGatewayStructs.sol
+++ b/contracts/interfaces/IGatewayStructs.sol
@@ -44,6 +44,7 @@ interface IGatewayStructs {
     error NotPredicateOrOwner();
     error InvalidSignature();
     error ZeroAddress();
+
     error WrongValue(uint256 expected, uint256 received);
     error BatchAlreadyExecuted();
     error TransferFailed();
diff --git a/test/fixtures.ts b/test/fixtures.ts
index 514b007..743970e 100644
--- a/test/fixtures.ts
+++ b/test/fixtures.ts
@@ -1,7 +1,7 @@
 import { ethers } from "hardhat";
 import { BigNumberish } from "ethers";
 import { alwaysTrueBytecode } from "./constants";
-// import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 
 export async function deployGatewayFixtures() {
   // Contracts are deployed using the first signer/account by default
@@ -23,18 +23,10 @@ export async function deployGatewayFixtures() {
   const gatewayLogic = await Gateway.deploy();
 
   // // deployment of contract proxy
-  const NativeTokenPredicateProxy = await ethers.getContractFactory(
-    "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol:ERC1967Proxy"
-  );
-  const NativeTokenWalletProxy = await ethers.getContractFactory(
-    "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol:ERC1967Proxy"
-  );
-  const ValidatorscProxy = await ethers.getContractFactory(
-    "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol:ERC1967Proxy"
-  );
-  const GatewayProxy = await ethers.getContractFactory(
-    "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol:ERC1967Proxy"
-  );
+  const NativeTokenPredicateProxy = await ethers.getContractFactory("ERC1967Proxy");
+  const NativeTokenWalletProxy = await ethers.getContractFactory("ERC1967Proxy");
+  const ValidatorscProxy = await ethers.getContractFactory("ERC1967Proxy");
+  const GatewayProxy = await ethers.getContractFactory("ERC1967Proxy");
 
   const nativeTokenPredicateProxy = await NativeTokenPredicateProxy.deploy(
     nativeTokenPredicateLogic.target,