Skip to content

Commit

Permalink
refactor: lint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@capedcrusader21
capedcrusader21 committed Sep 29, 2023
1 parent 84a7fd4 commit fa5e758
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion packages/marketplace/contracts/exchange/ExchangeCore.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import {LibFill} from "./libraries/LibFill.sol";
import {LibDirectTransfer} from "./libraries/LibDirectTransfer.sol";
import {IAssetMatcher} from "../interfaces/IAssetMatcher.sol";
import {TransferExecutor, LibTransfer} from "../transfer-manager/TransferExecutor.sol";
import {LibDeal, LibFeeSide, LibPart, LibAsset} from "../transfer-manager/lib/LibDeal.sol";
import {LibDeal, LibPart, LibAsset} from "../transfer-manager/lib/LibDeal.sol";
import {LibFeeSide} from "../transfer-manager/lib/LibFeeSide.sol";
import {LibOrderDataGeneric, LibOrder, LibOrderData} from "./libraries/LibOrderDataGeneric.sol";
import {ITransferManager} from "../transfer-manager/interfaces/ITransferManager.sol";
import {IOrderValidator} from "../interfaces/IOrderValidator.sol";
Expand Down
3 changes: 1 addition & 2 deletions packages/marketplace/contracts/transfer-manager/TransferManager.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ import {LibERC1155LazyMint} from "../lazy-mint/erc-1155/LibERC1155LazyMint.sol";
import {IRoyaltiesProvider} from "../interfaces/IRoyaltiesProvider.sol";
import {BpLibrary} from "../lib-bp/BpLibrary.sol";
import {IRoyaltyUGC} from "./interfaces/IRoyaltyUGC.sol";
import {ITransferManager, LibDeal} from "./interfaces/ITransferManager.sol";
import {ITransferManager, LibDeal, LibFeeSide} from "./interfaces/ITransferManager.sol";
import {LibAsset} from "../lib-asset/LibAsset.sol";
import {LibPart} from "../lib-part/LibPart.sol";
import {LibFeeSide} from "./lib/LibFeeSide.sol";

/// @title TransferManager contract
/// @notice responsible for transferring all Assets
Expand Down
3 changes: 2 additions & 1 deletion packages/marketplace/contracts/transfer-manager/interfaces/ITransferManager.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

pragma solidity 0.8.21;

import {LibDeal, LibFeeSide} from "../lib/LibDeal.sol";
import {LibDeal} from "../lib/LibDeal.sol";
import {LibFeeSide} from "../lib/LibFeeSide.sol";
import {ITransferExecutor} from "./ITransferExecutor.sol";

abstract contract ITransferManager is ITransferExecutor {
Expand Down
1 change: 0 additions & 1 deletion packages/marketplace/contracts/transfer-manager/lib/LibDeal.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pragma solidity 0.8.21;

import {LibPart} from "../../lib-part/LibPart.sol";
import {LibAsset} from "../../lib-asset/LibAsset.sol";
import {LibFeeSide} from "./LibFeeSide.sol";

library LibDeal {
struct DealSide {
Expand Down

1 comment on commit fa5e758

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage for this commit

40.75%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
packages/marketplace/contracts/exchange
   AssetMatcher.sol78.08%73.33%100%79.49%49–50, 50, 50–51, 53, 56, 59, 73–74, 74, 74–75, 77, 80–81
   Exchange.sol57.58%54.55%56.25%60.71%103, 110–113, 128, 128–129, 135, 135–136, 141, 173–174, 174, 188, 53, 94, 94, 96–97
   ExchangeCore.sol42.31%27.50%66.67%49.09%125–126, 141, 155–157, 164–165, 177, 192–193, 211–212, 212, 212, 212, 212, 214–215, 215, 215, 215, 215, 254, 254, 254–255, 255, 255–256, 256, 256, 258–259, 259, 259–260, 260, 260–261, 261, 261, 263, 265–266, 266, 266–267, 267, 267, 269, 297–298, 300–301, 332, 332, 332, 338, 341–343, 343, 343–345, 345, 345–346, 346–348, 348, 348, 350, 352, 352, 352, 354, 365, 368–369, 373–374, 377, 400, 402–404, 410–412, 436–437, 454, 471–472, 472, 472–473, 475–476, 478, 485, 485, 485–486, 488, 488, 488–489, 491, 87, 95
   OrderValidator.sol69.81%57.14%100%80.95%32, 48, 55–56, 56, 56, 66, 76–77, 82, 84, 84, 84, 84–85, 87
   WhiteList.sol97.62%93.75%100%100%51
packages/marketplace/contracts/exchange/libraries
   LibDirectTransfer.sol100%100%100%100%
   LibFill.sol55%33.33%66.67%63.64%48–49, 61, 71–72, 72, 72–73
   LibOrderDataGeneric.sol21.67%22.22%40%18.92%18–28, 30–31, 33, 46, 48, 48, 48–49, 51–52, 55, 55, 55–56, 58, 61, 61, 61–62, 64, 67, 71, 73, 73, 73–75, 78, 87, 87, 87–89
packages/marketplace/contracts/exchange/mocks
   ERC1155LazyMintTest.sol100%100%100%100%
   ERC721LazyMintTest.sol100%100%100%100%
   ExchangeTestImports.sol100%100%100%100%
   LibFillTest.sol0%100%0%0%17
   LibOrderTest.sol0%100%0%0%13, 17, 21, 25, 35, 47
   MockTrustedForwarder.sol0%0%0%0%14, 17–18, 18, 18–19
   SimpleTransferManager.sol0%100%0%0%13–16
   TestAssetMatcher.sol0%0%0%0%12, 12, 12–15, 15, 15–16, 19
   TestERC1155WithRoyaltyV2981.sol100%100%100%100%
   TestERC1271.sol0%0%0%0%24, 28, 28, 28
   TestERC20.sol100%100%100%100%
   TestERC721.sol100%100%100%100%
   TestERC721WithRoyaltyV2981.sol100%100%100%100%
   TestERC721WithRoyaltyV2981Multi.sol100%100%100%100%
   TestMinimalForwarder.sol0%0%0%0%12–15, 15, 15–16
   TestRoyaltiesRegistry.sol18%16.67%25%17.86%21–23, 23, 23–24, 24, 24–26, 28, 28, 28–29, 33, 38–39, 42–46, 50, 62–65, 65, 65–66, 66, 66–68, 70, 70, 70–71
packages/marketplace/contracts/exchange/mocks/tokens
   ERC2981.sol0%0%0%0%106, 38, 38, 38, 45, 47, 47, 47–48, 51, 53, 62, 74, 74, 74–75, 75, 75, 77, 84, 96, 96, 96–97, 97, 97, 99
   MintableERC1155.sol0%100%0%0%10, 14
   MintableERC1155WithRoyalties.sol0%0%0%0%13, 17, 21, 25, 9, 9, 9
   MintableERC20.sol0%100%0%0%10
   MintableERC721.sol0%100%0%0%10
   MintableERC721WithRoyalties.sol0%0%0%0%13, 17, 21, 25, 9, 9, 9
packages/marketplace/contracts/interfaces
   IAssetMatcher.sol100%100%100%100%
   IOrderValidator.sol100%100%100%100%
   IRoyaltiesProvider.sol100%100%100%100%
   IWhiteList.sol100%100%100%100%
packages/marketplace/contracts/lazy-mint/erc-1155
   IERC1155LazyMint.sol100%100%100%100%
   LibERC1155LazyMint.sol0%100%0%0%34–36, 38–40, 42
packages/marketplace/contracts/lazy-mint/erc-721
   IERC721LazyMint.sol100%100%100%100%
   LibERC721LazyMint.sol0%100%0%0%33–35, 37–39, 41
packages/marketplace/contracts/lazy-mint/mocks
   ERC1155LazyMintTest.sol0%0%0%0%15, 24–25, 25, 25–26, 28, 33
   ERC1155Test.sol0%0%0%0%14, 14–15, 22–24
   ERC721LazyMintTest.sol0%0%0%0%10, 14, 14, 14–15, 17, 22
   ERC721Test.sol0%0%0%0%13, 13–14, 21–23
packages/marketplace/contracts/lib-asset
   LibAsset.sol100%100%100%100%
packages/marketplace/contracts/lib-bp
   BpLibrary.sol0%100%0%0%13
packages/marketplace/contracts/lib-order
   

Please sign in to comment.