Skip to content

Commit

Permalink
feat: update imports
Browse files Browse the repository at this point in the history
  • Loading branch information
yi-sun committed Feb 6, 2024
1 parent 2840d8b commit e2a96bb
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 267 deletions.
1 change: 1 addition & 0 deletions remappings.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@axiom-crypto/v2-periphery/=lib/axiom-v2-periphery/src
52 changes: 21 additions & 31 deletions src/test/AxiomTest.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import "forge-std/Test.sol";
import "forge-std/console.sol";
import "./AxiomVm.sol";

import {IAxiomV2Core} from "@axiom-crypto/v2-periphery/interfaces/core/IAxiomV2Core.sol";
import {IAxiomV2Query} from "@axiom-crypto/v2-periphery/interfaces/query/IAxiomV2Query.sol";
import {IAxiomV2Client} from "@axiom-crypto/v2-periphery/interfaces/client/IAxiomV2Client.sol";
import {AxiomV2Addresses} from "@axiom-crypto/v2-periphery/client/AxiomV2Addresses.sol";
import { IAxiomV2Core } from "@axiom-crypto/v2-periphery/interfaces/core/IAxiomV2Core.sol";
import { IAxiomV2Query } from "@axiom-crypto/v2-periphery/interfaces/query/IAxiomV2Query.sol";
import { IAxiomV2Client } from "@axiom-crypto/v2-periphery/interfaces/client/IAxiomV2Client.sol";
import { AxiomV2Addresses } from "@axiom-crypto/v2-periphery/client/AxiomV2Addresses.sol";

abstract contract AxiomTest is Test {
address public axiomV2CoreAddress;
Expand All @@ -19,10 +19,7 @@ abstract contract AxiomTest is Test {

AxiomVm axiomVm;

function _createSelectForkAndSetupAxiom(
string memory urlOrAlias,
uint256 forkBlock
) internal {
function _createSelectForkAndSetupAxiom(string memory urlOrAlias, uint256 forkBlock) internal {
vm.createSelectFork(urlOrAlias, forkBlock);
uint64 chainId = uint64(block.chainid);

Expand All @@ -39,21 +36,15 @@ abstract contract AxiomTest is Test {
"AxiomV2Query not yet deployed at forkBlock"
);
} else {
axiomV2CoreAddress = AxiomV2Addresses.axiomV2CoreMockAddress(
chainId
);
axiomV2QueryAddress = AxiomV2Addresses.axiomV2QueryMockAddress(
chainId
);
axiomV2CoreAddress = AxiomV2Addresses.axiomV2CoreMockAddress(chainId);
axiomV2QueryAddress = AxiomV2Addresses.axiomV2QueryMockAddress(chainId);

require(
forkBlock >=
AxiomV2Addresses.axiomV2CoreMockDeployBlock(chainId),
forkBlock >= AxiomV2Addresses.axiomV2CoreMockDeployBlock(chainId),
"AxiomV2CoreMock not yet deployed at forkBlock"
);
require(
forkBlock >=
AxiomV2Addresses.axiomV2QueryMockDeployBlock(chainId),
forkBlock >= AxiomV2Addresses.axiomV2QueryMockDeployBlock(chainId),
"AxiomV2QueryMock not yet deployed at forkBlock"
);
}
Expand All @@ -66,18 +57,17 @@ abstract contract AxiomTest is Test {
axiomVm = new AxiomVm(axiomV2QueryAddress, urlOrAlias);
}

function query(
bytes32 _querySchema,
bytes memory input,
address callbackTarget
) internal view returns (Query memory) {
return
Query({
querySchema: _querySchema,
input: input,
callbackTarget: callbackTarget,
axiomVm: axiomVm,
outputString: ""
});
function query(bytes32 _querySchema, bytes memory input, address callbackTarget)
internal
view
returns (Query memory)
{
return Query({
querySchema: _querySchema,
input: input,
callbackTarget: callbackTarget,
axiomVm: axiomVm,
outputString: ""
});
}
}
Loading

0 comments on commit e2a96bb

Please sign in to comment.