refactor: use canonical openzeppelin remappings

vlayer-xyz · Nov 26, 2024 · d59816d · d59816d
1 parent e622348
commit d59816d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/contracts/script/Manage.s.sol b/contracts/script/Manage.s.sol
@@ -18,7 +18,7 @@ pragma solidity ^0.8.9;
 
 import {Script} from "forge-std/Script.sol";
 import {console2} from "forge-std/console2.sol";
-import {TimelockController} from "openzeppelin/contracts/governance/TimelockController.sol";
+import {TimelockController} from "openzeppelin-contracts/governance/TimelockController.sol";
 import {RiscZeroVerifierRouter} from "../src/RiscZeroVerifierRouter.sol";
 import {RiscZeroVerifierEmergencyStop} from "../src/RiscZeroVerifierEmergencyStop.sol";
 import {IRiscZeroVerifier} from "../src//IRiscZeroVerifier.sol";

diff --git a/contracts/src/RiscZeroVerifierEmergencyStop.sol b/contracts/src/RiscZeroVerifierEmergencyStop.sol
@@ -16,8 +16,8 @@
 
 pragma solidity ^0.8.9;
 
-import {Ownable, Ownable2Step} from "openzeppelin/contracts/access/Ownable2Step.sol";
-import {Pausable} from "openzeppelin/contracts/utils/Pausable.sol";
+import {Ownable, Ownable2Step} from "openzeppelin-contracts/access/Ownable2Step.sol";
+import {Pausable} from "openzeppelin-contracts/utils/Pausable.sol";
 
 import {IRiscZeroVerifier, Receipt} from "./IRiscZeroVerifier.sol";
 

diff --git a/contracts/src/RiscZeroVerifierRouter.sol b/contracts/src/RiscZeroVerifierRouter.sol
@@ -16,7 +16,7 @@
 
 pragma solidity ^0.8.9;
 
-import {Ownable, Ownable2Step} from "openzeppelin/contracts/access/Ownable2Step.sol";
+import {Ownable, Ownable2Step} from "openzeppelin-contracts/access/Ownable2Step.sol";
 
 import {IRiscZeroVerifier, Receipt} from "./IRiscZeroVerifier.sol";
 

diff --git a/contracts/src/StructHash.sol b/contracts/src/StructHash.sol
@@ -16,7 +16,7 @@
 
 pragma solidity ^0.8.9;
 
-import {SafeCast} from "openzeppelin/contracts/utils/math/SafeCast.sol";
+import {SafeCast} from "openzeppelin-contracts/utils/math/SafeCast.sol";
 
 import {reverseByteOrderUint16} from "./Util.sol";
 

diff --git a/contracts/src/groth16/RiscZeroGroth16Verifier.sol b/contracts/src/groth16/RiscZeroGroth16Verifier.sol
@@ -17,7 +17,7 @@
 
 pragma solidity ^0.8.9;
 
-import {SafeCast} from "openzeppelin/contracts/utils/math/SafeCast.sol";
+import {SafeCast} from "openzeppelin-contracts/utils/math/SafeCast.sol";
 
 import {ControlID} from "./ControlID.sol";
 import {Groth16Verifier} from "./Groth16Verifier.sol";

diff --git a/contracts/test/RiscZeroVerifierEmergencyStop.t.sol b/contracts/test/RiscZeroVerifierEmergencyStop.t.sol
@@ -18,8 +18,8 @@ pragma solidity ^0.8.13;
 
 import {Test} from "forge-std/Test.sol";
 import {console2} from "forge-std/console2.sol";
-import {Ownable} from "openzeppelin/contracts/access/Ownable.sol";
-import {Pausable} from "openzeppelin/contracts/utils/Pausable.sol";
+import {Ownable} from "openzeppelin-contracts/access/Ownable.sol";
+import {Pausable} from "openzeppelin-contracts/utils/Pausable.sol";
 
 import {
     IRiscZeroVerifier,

diff --git a/contracts/test/RiscZeroVerifierRouter.t.sol b/contracts/test/RiscZeroVerifierRouter.t.sol
@@ -18,7 +18,7 @@ pragma solidity ^0.8.13;
 
 import {Test} from "forge-std/Test.sol";
 import {console2} from "forge-std/console2.sol";
-import {Ownable} from "openzeppelin/contracts/access/Ownable.sol";
+import {Ownable} from "openzeppelin-contracts/access/Ownable.sol";
 
 import {
     IRiscZeroVerifier,