diff --git a/src/_modules/experimental/Request.sol b/src/_modules/Request.sol similarity index 98% rename from src/_modules/experimental/Request.sol rename to src/_modules/Request.sol index 7e4fdbaa..8c0948ab 100644 --- a/src/_modules/experimental/Request.sol +++ b/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 index 70458f66..82fdff7c 100644 --- 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 index 27f6e170..9f08ba00 100644 --- 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 index def5b89d..badff47b 100644 --- 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 *;