chore: replace V2/interfaces

witnet · Feb 14, 2024 · 67ac34a · 67ac34a
1 parent 7aebf47
commit 67ac34a
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 25 deletions.
diff --git a/contracts/WitnetOracle.sol b/contracts/WitnetOracle.sol
@@ -4,8 +4,8 @@ pragma solidity >=0.7.0 <0.9.0;
 
 import "./WitnetRequestBytecodes.sol";
 import "./WitnetRequestFactory.sol";
-import "./interfaces/V2/IWitnetOracle.sol";
-import "./interfaces/V2/IWitnetOracleEvents.sol";
+import "./interfaces/IWitnetOracle.sol";
+import "./interfaces/IWitnetOracleEvents.sol";
 
 /// @title Witnet Request Board functionality base contract.
 /// @author The Witnet Foundation.

diff --git a/contracts/WitnetPriceFeeds.sol b/contracts/WitnetPriceFeeds.sol
@@ -4,8 +4,8 @@ pragma solidity >=0.7.0 <0.9.0;
 
 import "./apps/WitnetFeeds.sol";
 
-import "./interfaces/V2/IWitnetPriceFeeds.sol";
-import "./interfaces/V2/IWitnetPriceSolverDeployer.sol";
+import "./interfaces/IWitnetPriceFeeds.sol";
+import "./interfaces/IWitnetPriceSolverDeployer.sol";
 
 /// @title WitnetPriceFeeds: Price Feeds live repository reliant on the Witnet Oracle blockchain.
 /// @author The Witnet Foundation.

diff --git a/contracts/WitnetRequestBytecodes.sol b/contracts/WitnetRequestBytecodes.sol
@@ -3,7 +3,7 @@
 pragma solidity >=0.7.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./interfaces/V2/IWitnetRequestBytecodes.sol";
+import "./interfaces/IWitnetRequestBytecodes.sol";
 
 abstract contract WitnetRequestBytecodes
     is

diff --git a/contracts/WitnetRequestFactory.sol b/contracts/WitnetRequestFactory.sol
@@ -5,7 +5,7 @@ pragma experimental ABIEncoderV2;
 
 import "./WitnetRequestBytecodes.sol";
 import "./WitnetOracle.sol";
-import "./interfaces/V2/IWitnetRequestFactory.sol";
+import "./interfaces/IWitnetRequestFactory.sol";
 
 abstract contract WitnetRequestFactory
     is

diff --git a/contracts/apps/WitnetConsumer.sol b/contracts/apps/WitnetConsumer.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import "./UsingWitnet.sol";
-import "../interfaces/V2/IWitnetConsumer.sol";
+import "../interfaces/IWitnetConsumer.sol";
 
 abstract contract WitnetConsumer
     is

diff --git a/contracts/apps/WitnetFeeds.sol b/contracts/apps/WitnetFeeds.sol
@@ -2,9 +2,9 @@
 
 pragma solidity >=0.7.0 <0.9.0;
 
-import "../interfaces/V2/IFeeds.sol";
-import "../interfaces/V2/IWitnetFeeds.sol";
-import "../interfaces/V2/IWitnetFeedsAdmin.sol";
+import "../interfaces/IFeeds.sol";
+import "../interfaces/IWitnetFeeds.sol";
+import "../interfaces/IWitnetFeedsAdmin.sol";
 
 import "ado-contracts/contracts/interfaces/IERC2362.sol";
 

diff --git a/contracts/apps/WitnetPriceSolverBase.sol b/contracts/apps/WitnetPriceSolverBase.sol
@@ -3,7 +3,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import "../data/WitnetPriceFeedsData.sol";
-import "../interfaces/V2/IWitnetPriceFeeds.sol";
+import "../interfaces/IWitnetPriceFeeds.sol";
 
 abstract contract WitnetPriceSolverBase
     is

diff --git a/contracts/core/defaults/WitnetRequestBoardTrustableBase.sol b/contracts/core/defaults/WitnetRequestBoardTrustableBase.sol
@@ -10,8 +10,8 @@ import "../../WitnetRequestFactory.sol";
 import "../../data/WitnetRequestBoardDataACLs.sol";
 import "../../interfaces/IWitnetRequest.sol";
 import "../../interfaces/IWitnetRequestBoardAdminACLs.sol";
-import "../../interfaces/V2/IWitnetRequestBoardReporter.sol";
-import "../../interfaces/V2/IWitnetConsumer.sol";
+import "../../interfaces/IWitnetRequestBoardReporter.sol";
+import "../../interfaces/IWitnetConsumer.sol";
 import "../../libs/WitnetErrorsLib.sol";
 import "../../patterns/Payable.sol";
 

diff --git a/contracts/interfaces/V2/IFeeds.sol → contracts/interfaces/IFeeds.sol b/contracts/interfaces/V2/IFeeds.sol → contracts/interfaces/IFeeds.sol
diff --git a/contracts/interfaces/V2/IWitnetConsumer.sol → contracts/interfaces/IWitnetConsumer.sol b/contracts/interfaces/V2/IWitnetConsumer.sol → contracts/interfaces/IWitnetConsumer.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "../../libs/Witnet.sol";
+import "../libs/Witnet.sol";
 
 interface IWitnetConsumer {
 

diff --git a/contracts/interfaces/V2/IWitnetFeeds.sol → contracts/interfaces/IWitnetFeeds.sol b/contracts/interfaces/V2/IWitnetFeeds.sol → contracts/interfaces/IWitnetFeeds.sol
@@ -2,8 +2,8 @@
 
 pragma solidity >=0.8.0 <0.9.0;
 
-import "../../WitnetRequestBytecodes.sol";
-import "../../WitnetOracle.sol";
+import "../WitnetOracle.sol";
+import "../WitnetRequestBytecodes.sol";
 
 interface IWitnetFeeds {
 

diff --git a/...racts/interfaces/V2/IWitnetFeedsAdmin.sol → contracts/interfaces/IWitnetFeedsAdmin.sol b/...racts/interfaces/V2/IWitnetFeedsAdmin.sol → contracts/interfaces/IWitnetFeedsAdmin.sol
@@ -2,8 +2,8 @@
 
 pragma solidity >=0.8.0 <0.9.0;
 
-import "../../libs/WitnetV2.sol";
-import "../../WitnetRequest.sol";
+import "../libs/WitnetV2.sol";
+import "../WitnetRequest.sol";
 
 interface IWitnetFeedsAdmin {
     function acceptOwnership() external;

diff --git a/contracts/interfaces/V2/IWitnetOracle.sol → contracts/interfaces/IWitnetOracle.sol b/contracts/interfaces/V2/IWitnetOracle.sol → contracts/interfaces/IWitnetOracle.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 
-import "../../libs/WitnetV2.sol";
+import "../libs/WitnetV2.sol";
 
 interface IWitnetOracle {
 

diff --git a/...cts/interfaces/V2/IWitnetOracleEvents.sol → contracts/interfaces/IWitnetOracleEvents.sol b/...cts/interfaces/V2/IWitnetOracleEvents.sol → contracts/interfaces/IWitnetOracleEvents.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.7.0 <0.9.0;
 
-import "../../libs/WitnetV2.sol";
+import "../libs/WitnetV2.sol";
 
 interface IWitnetOracleEvents {
 

diff --git a/...racts/interfaces/V2/IWitnetPriceFeeds.sol → contracts/interfaces/IWitnetPriceFeeds.sol b/...racts/interfaces/V2/IWitnetPriceFeeds.sol → contracts/interfaces/IWitnetPriceFeeds.sol
diff --git a/...acts/interfaces/V2/IWitnetPriceSolver.sol → contracts/interfaces/IWitnetPriceSolver.sol b/...acts/interfaces/V2/IWitnetPriceSolver.sol → contracts/interfaces/IWitnetPriceSolver.sol
@@ -2,7 +2,7 @@
 
 pragma solidity >=0.8.0 <0.9.0;
 
-import "../../libs/WitnetV2.sol";
+import "../libs/WitnetV2.sol";
 
 interface IWitnetPriceSolver {
     struct Price {

diff --git a/...erfaces/V2/IWitnetPriceSolverDeployer.sol → ...interfaces/IWitnetPriceSolverDeployer.sol b/...erfaces/V2/IWitnetPriceSolverDeployer.sol → ...interfaces/IWitnetPriceSolverDeployer.sol
diff --git a/...rfaces/V2/IWitnetRequestBoardReporter.sol → ...nterfaces/IWitnetRequestBoardReporter.sol b/...rfaces/V2/IWitnetRequestBoardReporter.sol → ...nterfaces/IWitnetRequestBoardReporter.sol
diff --git a/...interfaces/V2/IWitnetRequestBytecodes.sol → ...ts/interfaces/IWitnetRequestBytecodes.sol b/...interfaces/V2/IWitnetRequestBytecodes.sol → ...ts/interfaces/IWitnetRequestBytecodes.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0 <0.9.0;
 
-import "../../libs/Witnet.sol";
+import "../libs/Witnet.sol";
 
 interface IWitnetRequestBytecodes {
 

diff --git a/...s/interfaces/V2/IWitnetRequestFactory.sol → ...acts/interfaces/IWitnetRequestFactory.sol b/...s/interfaces/V2/IWitnetRequestFactory.sol → ...acts/interfaces/IWitnetRequestFactory.sol
diff --git a/contracts/libs/WitnetPriceFeedsLib.sol b/contracts/libs/WitnetPriceFeedsLib.sol
@@ -3,8 +3,8 @@
 pragma solidity >=0.7.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "../interfaces/V2/IWitnetPriceSolver.sol";
-import "../interfaces/V2/IWitnetPriceSolverDeployer.sol";
+import "../interfaces/IWitnetPriceSolver.sol";
+import "../interfaces/IWitnetPriceSolverDeployer.sol";
 
 import "../libs/Slices.sol";
 

diff --git a/src/index.js b/src/index.js
@@ -37,7 +37,7 @@ module.exports = {
     WitnetRequestFactory: require("../artifacts/contracts/WitnetRequestFactory.sol/WitnetRequestFactory.json"),
     WitnetRequestTemplate: require("../artifacts/contracts/WitnetRequestTemplate.sol/WitnetRequestTemplate.json"),
     WitnetUpgradableBase: require("../artifacts/contracts/core/WitnetUpgradableBase.sol/WitnetUpgradableBase.json"),
-    IWitnetPriceSolver: require("../artifacts/contracts/interfaces/V2/IWitnetPriceSolver.sol/IWitnetPriceSolver.json"),
+    IWitnetPriceSolver: require("../artifacts/contracts/interfaces/IWitnetPriceSolver.sol/IWitnetPriceSolver.json"),
   },
   settings: require("../settings"),
   utils,