set prettierrc compiler version to support multi-line imports

yueh-github · Jul 6, 2022 · f62c14f · f62c14f
1 parent 5d2e2bc
commit f62c14f
Show file tree

Hide file tree

Showing 68 changed files with 360 additions and 144 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -6,6 +6,7 @@ module.exports = {
         tabWidth: 4,
         printWidth: 80,
         bracketSpacing: true,
+        compiler: "0.8.14",
       },
     },
   ],

diff --git a/contracts/conduit/Conduit.sol b/contracts/conduit/Conduit.sol
@@ -7,7 +7,6 @@ import { ConduitItemType } from "./lib/ConduitEnums.sol";
 
 import { TokenTransferrer } from "../lib/TokenTransferrer.sol";
 
-// prettier-ignore
 import {
     ConduitTransfer,
     ConduitBatch1155Transfer

diff --git a/contracts/conduit/ConduitController.sol b/contracts/conduit/ConduitController.sol
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
-	ConduitControllerInterface
+    ConduitControllerInterface
 } from "../interfaces/ConduitControllerInterface.sol";
 
 import { ConduitInterface } from "../interfaces/ConduitInterface.sol";

diff --git a/contracts/helpers/TransferHelper.sol b/contracts/helpers/TransferHelper.sol
@@ -7,7 +7,6 @@ import { TokenTransferrer } from "../lib/TokenTransferrer.sol";
 
 import { ConduitInterface } from "../interfaces/ConduitInterface.sol";
 
-// prettier-ignore
 import {
     ConduitControllerInterface
 } from "../interfaces/ConduitControllerInterface.sol";
@@ -16,7 +15,6 @@ import { Conduit } from "../conduit/Conduit.sol";
 
 import { ConduitTransfer } from "../conduit/lib/ConduitStructs.sol";
 
-// prettier-ignore
 import {
     TransferHelperInterface
 } from "../interfaces/TransferHelperInterface.sol";

diff --git a/contracts/interfaces/ConduitInterface.sol b/contracts/interfaces/ConduitInterface.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     ConduitTransfer,
     ConduitBatch1155Transfer

diff --git a/contracts/interfaces/ConsiderationInterface.sol b/contracts/interfaces/ConsiderationInterface.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     BasicOrderParameters,
     OrderComponents,

diff --git a/contracts/interfaces/SeaportInterface.sol b/contracts/interfaces/SeaportInterface.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     BasicOrderParameters,
     OrderComponents,

diff --git a/contracts/interfaces/ZoneInterface.sol b/contracts/interfaces/ZoneInterface.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     AdvancedOrder,
     CriteriaResolver

diff --git a/contracts/lib/AmountDeriver.sol b/contracts/lib/AmountDeriver.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-// prettier-ignore
 import {
     AmountDerivationErrors
 } from "../interfaces/AmountDerivationErrors.sol";

diff --git a/contracts/lib/Assertions.sol b/contracts/lib/Assertions.sol
@@ -5,7 +5,6 @@ import { OrderParameters } from "./ConsiderationStructs.sol";
 
 import { GettersAndDerivers } from "./GettersAndDerivers.sol";
 
-// prettier-ignore
 import {
     TokenTransferrerErrors
 } from "../interfaces/TokenTransferrerErrors.sol";

diff --git a/contracts/lib/BasicOrderFulfiller.sol b/contracts/lib/BasicOrderFulfiller.sol
@@ -3,14 +3,12 @@ pragma solidity ^0.8.13;
 
 import { ConduitInterface } from "../interfaces/ConduitInterface.sol";
 
-// prettier-ignore
 import {
     OrderType,
     ItemType,
     BasicOrderRouteType
 } from "./ConsiderationEnums.sol";
 
-// prettier-ignore
 import {
     AdditionalRecipient,
     BasicOrderParameters,

diff --git a/contracts/lib/Consideration.sol b/contracts/lib/Consideration.sol
@@ -1,12 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-// prettier-ignore
 import {
     ConsiderationInterface
 } from "../interfaces/ConsiderationInterface.sol";
 
-// prettier-ignore
 import {
     OrderComponents,
     BasicOrderParameters,

diff --git a/contracts/lib/ConsiderationBase.sol b/contracts/lib/ConsiderationBase.sol
@@ -1,12 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-// prettier-ignore
 import {
     ConduitControllerInterface
 } from "../interfaces/ConduitControllerInterface.sol";
 
-// prettier-ignore
 import {
     ConsiderationEventsAndErrors
 } from "../interfaces/ConsiderationEventsAndErrors.sol";

diff --git a/contracts/lib/ConsiderationStructs.sol b/contracts/lib/ConsiderationStructs.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     OrderType,
     BasicOrderType,

diff --git a/contracts/lib/CounterManager.sol b/contracts/lib/CounterManager.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-// prettier-ignore
 import {
     ConsiderationEventsAndErrors
 } from "../interfaces/ConsiderationEventsAndErrors.sol";

diff --git a/contracts/lib/CriteriaResolution.sol b/contracts/lib/CriteriaResolution.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import { ItemType, Side } from "./ConsiderationEnums.sol";
 
-// prettier-ignore
 import {
     OfferItem,
     ConsiderationItem,
@@ -14,7 +13,6 @@ import {
 
 import "./ConsiderationConstants.sol";
 
-// prettier-ignore
 import {
     CriteriaResolutionErrors
 } from "../interfaces/CriteriaResolutionErrors.sol";

diff --git a/contracts/lib/FulfillmentApplier.sol b/contracts/lib/FulfillmentApplier.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import { ItemType, Side } from "./ConsiderationEnums.sol";
 
-// prettier-ignore
 import {
     OfferItem,
     ConsiderationItem,
@@ -16,7 +15,6 @@ import {
 
 import "./ConsiderationConstants.sol";
 
-// prettier-ignore
 import {
     FulfillmentApplicationErrors
 } from "../interfaces/FulfillmentApplicationErrors.sol";

diff --git a/contracts/lib/OrderCombiner.sol b/contracts/lib/OrderCombiner.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import { Side, ItemType } from "./ConsiderationEnums.sol";
 
-// prettier-ignore
 import {
     OfferItem,
     ConsiderationItem,

diff --git a/contracts/lib/OrderFulfiller.sol b/contracts/lib/OrderFulfiller.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import { ItemType } from "./ConsiderationEnums.sol";
 
-// prettier-ignore
 import {
     OfferItem,
     ConsiderationItem,

diff --git a/contracts/lib/OrderValidator.sol b/contracts/lib/OrderValidator.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import { OrderType } from "./ConsiderationEnums.sol";
 
-// prettier-ignore
 import {
     OrderParameters,
     Order,

diff --git a/contracts/lib/SignatureVerification.sol b/contracts/lib/SignatureVerification.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import { EIP1271Interface } from "../interfaces/EIP1271Interface.sol";
 
-// prettier-ignore
 import {
     SignatureVerificationErrors
 } from "../interfaces/SignatureVerificationErrors.sol";

diff --git a/contracts/lib/TokenTransferrer.sol b/contracts/lib/TokenTransferrer.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.7;
 
 import "./TokenTransferrerConstants.sol";
 
-// prettier-ignore
 import {
     TokenTransferrerErrors
 } from "../interfaces/TokenTransferrerErrors.sol";

diff --git a/contracts/lib/ZoneInteraction.sol b/contracts/lib/ZoneInteraction.sol
@@ -5,15 +5,11 @@ import { ZoneInterface } from "../interfaces/ZoneInterface.sol";
 
 import { OrderType } from "./ConsiderationEnums.sol";
 
-// prettier-ignore
 import { AdvancedOrder, CriteriaResolver } from "./ConsiderationStructs.sol";
 
 import "./ConsiderationConstants.sol";
 
-// prettier-ignore
-import {
-    ZoneInteractionErrors
-} from "../interfaces/ZoneInteractionErrors.sol";
+import { ZoneInteractionErrors } from "../interfaces/ZoneInteractionErrors.sol";
 
 import { LowLevelHelpers } from "./LowLevelHelpers.sol";
 

diff --git a/contracts/test/TestZone.sol b/contracts/test/TestZone.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.7;
 
 import { ZoneInterface } from "../interfaces/ZoneInterface.sol";
 
-// prettier-ignore
 import {
     AdvancedOrder,
     CriteriaResolver

diff --git a/reference/ReferenceConsideration.sol b/reference/ReferenceConsideration.sol
@@ -1,12 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     ConsiderationInterface
 } from "contracts/interfaces/ConsiderationInterface.sol";
 
-// prettier-ignore
 import {
     OrderComponents,
     BasicOrderParameters,
@@ -22,7 +20,10 @@ import {
 
 import { ReferenceOrderCombiner } from "./lib/ReferenceOrderCombiner.sol";
 
-import { OrderToExecute, AccumulatorStruct } from "./lib/ReferenceConsiderationStructs.sol";
+import {
+    OrderToExecute,
+    AccumulatorStruct
+} from "./lib/ReferenceConsiderationStructs.sol";
 
 /**
  * @title ReferenceConsideration

diff --git a/reference/conduit/ReferenceConduit.sol b/reference/conduit/ReferenceConduit.sol
@@ -5,12 +5,10 @@ import { ConduitInterface } from "contracts/interfaces/ConduitInterface.sol";
 
 import { ConduitItemType } from "contracts/conduit/lib/ConduitEnums.sol";
 
-// prettier-ignore
 import {
     ReferenceTokenTransferrer
 } from "../lib/ReferenceTokenTransferrer.sol";
 
-// prettier-ignore
 import {
     ConduitTransfer,
     ConduitBatch1155Transfer

diff --git a/reference/conduit/ReferenceConduitController.sol b/reference/conduit/ReferenceConduitController.sol
@@ -3,9 +3,8 @@ pragma solidity ^0.8.7;
 
 import { ReferenceConduit } from "./ReferenceConduit.sol";
 
-// prettier-ignore
 import {
-	ConduitControllerInterface
+    ConduitControllerInterface
 } from "contracts/interfaces/ConduitControllerInterface.sol";
 
 import { ConduitInterface } from "contracts/interfaces/ConduitInterface.sol";

diff --git a/reference/lib/ReferenceAmountDeriver.sol b/reference/lib/ReferenceAmountDeriver.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     AmountDerivationErrors
 } from "contracts/interfaces/AmountDerivationErrors.sol";

diff --git a/reference/lib/ReferenceAssertions.sol b/reference/lib/ReferenceAssertions.sol
@@ -5,7 +5,9 @@ import { OrderParameters } from "contracts/lib/ConsiderationStructs.sol";
 
 import { ReferenceGettersAndDerivers } from "./ReferenceGettersAndDerivers.sol";
 
-import { TokenTransferrerErrors } from "contracts/interfaces/TokenTransferrerErrors.sol";
+import {
+    TokenTransferrerErrors
+} from "contracts/interfaces/TokenTransferrerErrors.sol";
 
 import { ReferenceCounterManager } from "./ReferenceCounterManager.sol";
 

diff --git a/reference/lib/ReferenceBasicOrderFulfiller.sol b/reference/lib/ReferenceBasicOrderFulfiller.sol
@@ -1,15 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     OrderType,
     BasicOrderType,
     ItemType,
     BasicOrderRouteType
 } from "contracts/lib/ConsiderationEnums.sol";
 
-// prettier-ignore
 import {
     AdditionalRecipient,
     BasicOrderParameters,
@@ -19,7 +17,6 @@ import {
     ReceivedItem
 } from "contracts/lib/ConsiderationStructs.sol";
 
-// prettier-ignore
 import {
     AccumulatorStruct,
     BasicFulfillmentHashes,

diff --git a/reference/lib/ReferenceConsiderationBase.sol b/reference/lib/ReferenceConsiderationBase.sol
@@ -1,12 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     ConduitControllerInterface
 } from "contracts/interfaces/ConduitControllerInterface.sol";
 
-// prettier-ignore
 import {
     ConsiderationEventsAndErrors
 } from "contracts/interfaces/ConsiderationEventsAndErrors.sol";

diff --git a/reference/lib/ReferenceConsiderationStructs.sol b/reference/lib/ReferenceConsiderationStructs.sol
@@ -1,13 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
-import {
-    OrderType,
-    ItemType
-} from "contracts/lib/ConsiderationEnums.sol";
+import { OrderType, ItemType } from "contracts/lib/ConsiderationEnums.sol";
 
-import { SpentItem, ReceivedItem } from "contracts/lib/ConsiderationStructs.sol";
+import {
+    SpentItem,
+    ReceivedItem
+} from "contracts/lib/ConsiderationStructs.sol";
 
 import { ConduitTransfer } from "contracts/conduit/lib/ConduitStructs.sol";
 

diff --git a/reference/lib/ReferenceCounterManager.sol b/reference/lib/ReferenceCounterManager.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.7;
 
-// prettier-ignore
 import {
     ConsiderationEventsAndErrors
 } from "contracts/interfaces/ConsiderationEventsAndErrors.sol";

diff --git a/reference/lib/ReferenceCriteriaResolution.sol b/reference/lib/ReferenceCriteriaResolution.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.7;
 
 import { ItemType, Side } from "contracts/lib/ConsiderationEnums.sol";
 
-// prettier-ignore
 import {
     OfferItem,
     ConsiderationItem,
@@ -18,7 +17,6 @@ import { OrderToExecute } from "./ReferenceConsiderationStructs.sol";
 
 import "contracts/lib/ConsiderationConstants.sol";
 
-// prettier-ignore
 import {
     CriteriaResolutionErrors
 } from "contracts/interfaces/CriteriaResolutionErrors.sol";