Skip to content

Commit

Permalink
modify import statements
Browse files Browse the repository at this point in the history
  • Loading branch information
stephankmin committed Jun 13, 2022
1 parent 57560c3 commit 820f405
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion contracts/zones/PausableZoneController.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {

import { Order, Fulfillment, OrderComponents, AdvancedOrder, CriteriaResolver, Execution } from "../lib/ConsiderationStructs.sol";

contract DeployerGlobalPausable is GlobalPausableEventsAndErrors {
contract PausableZoneController is GlobalPausableEventsAndErrors {
//owns this deployer and can activate the kill switch for the GlobalPausable
address public deployerOwner;

Expand Down
2 changes: 1 addition & 1 deletion reference/shim/Shim.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { TestERC20 } from "contracts/test/TestERC20.sol";
import { TestERC721 } from "contracts/test/TestERC721.sol";
import { TestERC1155 } from "contracts/test/TestERC1155.sol";
import { TestZone } from "contracts/test/TestZone.sol";
import { DeployerGlobalPausable } from "contracts/zones/DeployerGlobalPausable.sol";
import { PausableZoneController } from "contracts/zones/PausableZoneController.sol";
import { TransferHelper } from "contracts/helpers/TransferHelper.sol";
// prettier-ignore
import {
Expand Down
9 changes: 2 additions & 7 deletions test/foundry/FulfillBasicOrderTest.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,13 @@ import { AdditionalRecipient, Order } from "../../contracts/lib/ConsiderationStr
import { ConsiderationInterface } from "../../contracts/interfaces/ConsiderationInterface.sol";
import { OfferItem, ConsiderationItem, OrderComponents, BasicOrderParameters } from "../../contracts/lib/ConsiderationStructs.sol";
import { BaseOrderTest } from "./utils/BaseOrderTest.sol";

import { TestERC721 } from "../../contracts/test/TestERC721.sol";

import { TestERC1155 } from "../../contracts/test/TestERC1155.sol";

import { TestERC20 } from "../../contracts/test/TestERC20.sol";
import { ArithmeticUtil } from "./utils/ArithmeticUtil.sol";

import { OrderParameters } from "./utils/reentrancy/ReentrantStructs.sol";

import { DeployerGlobalPausable } from "../../contracts/zones/DeployerGlobalPausable.sol";
import { GlobalPausable } from "../../contracts/zones/GlobalPausable.sol";
import { PausableZoneController } from "../../contracts/zones/PausableZoneController.sol";
import { PausableZone } from "../../contracts/zones/PausableZone.sol";

contract FulfillBasicOrderTest is BaseOrderTest {
using ArithmeticUtil for uint128;
Expand Down

0 comments on commit 820f405

Please sign in to comment.