chore: move requests module out of experimental (#209)

* chore: move requests module out of experimental * chore: add requests to script.sol
nomoixyz · Oct 2, 2023 · 806124a · 806124a
1 parent 6503f50
commit 806124a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/src/_modules/experimental/Request.sol → src/_modules/Request.sol b/src/_modules/experimental/Request.sol → src/_modules/Request.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import {Command, CommandResult, CommandOutput, commands} from "../Commands.sol";
-import {JsonObject, json as jsonModule, JsonResult, Ok} from "../Json.sol";
-import {semver, Semver} from "../Semver.sol";
+import {Command, CommandResult, CommandOutput, commands} from "./Commands.sol";
+import {JsonObject, json as jsonModule, JsonResult, Ok} from "./Json.sol";
+import {semver, Semver} from "./Semver.sol";
 
-import {Pointer} from "../Pointer.sol";
-import {BytesResult, StringResult, Ok, ResultType, LibResultPointer} from "../Result.sol";
-import {LibError, Error} from "../Error.sol";
+import {Pointer} from "./Pointer.sol";
+import {BytesResult, StringResult, Ok, ResultType, LibResultPointer} from "./Result.sol";
+import {LibError, Error} from "./Error.sol";
 
 enum Method {
     GET,

diff --git a/src/script.sol b/src/script.sol
@@ -22,6 +22,16 @@ import {removeSelector} from "./_utils/removeSelector.sol";
 import {huff, Huffc} from "./_modules/Huff.sol";
 import {fe, Fe} from "./_modules/Fe.sol";
 import {semver, Semver} from "./_modules/Semver.sol";
+import {
+    request,
+    Headers,
+    ResponseResult,
+    RequestResult,
+    Response,
+    Request,
+    RequestClient,
+    RequestBuilder
+} from "./_modules/Request.sol";
 
 contract Script {
     bool public IS_SCRIPT = true;

diff --git a/src/test.sol b/src/test.sol
@@ -29,6 +29,16 @@ import {removeSelector} from "./_utils/removeSelector.sol";
 import {Ok, StringResult, BoolResult, BytesResult, EmptyResult} from "./_modules/Result.sol";
 import {Error} from "./_modules/Error.sol";
 import {semver, Semver} from "./_modules/Semver.sol";
+import {
+    request,
+    Headers,
+    ResponseResult,
+    RequestResult,
+    Response,
+    Request,
+    RequestClient,
+    RequestBuilder
+} from "./_modules/Request.sol";
 
 // @dev Main entry point to Vulcan tests
 contract Test is InvariantsBase {

diff --git a/test/_modules/Request.t.sol b/test/_modules/Request.t.sol
@@ -11,7 +11,7 @@ import {
     ResponseResult,
     RequestBuilder,
     Headers
-} from "../../src/_modules/experimental/Request.sol";
+} from "../../src/_modules/Request.sol";
 
 contract RequestTest is Test {
     using vulcan for *;