Skip to content

Commit

Permalink
fix: rebase conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@capedcrusader21
capedcrusader21 committed Sep 29, 2023
1 parent 4c7da9d commit e0bb1e0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/marketplace/contracts/mocks/SimpleTransferManager.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.21;

import {ITransferManager, LibDeal, LibFeeSide} from "../../transfer-manager/interfaces/ITransferManager.sol";
import {ITransferManager, LibDeal, LibFeeSide} from "../transfer-manager/interfaces/ITransferManager.sol";

abstract contract SimpleTransferManager is ITransferManager {
function doTransfers(
Expand Down

1 comment on commit e0bb1e0

@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

54.10%

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.sol76.56%86.36%75%69.23%102, 109–112, 194, 53, 94, 94–96
   ExchangeCore.sol43.54%30%66.67%49.55%130–131, 146, 160–162, 169–170, 182, 197–198, 216–217, 217, 217, 217, 217, 219–220, 220, 220, 220, 220, 259, 259, 259–260, 260, 260–261, 261, 261, 263–264, 264, 264–265, 265, 265–266, 266, 266, 268, 270–271, 271, 271–272, 272, 272, 274, 301–302, 304–305, 336, 336, 336, 342, 345–347, 347, 347–349, 349, 349–350, 350–352, 352, 352, 354, 356, 356, 356, 358, 369, 372–373, 377–378, 381, 404, 406–408, 414–416, 439–440, 457, 474–475, 475, 475–476, 478–479, 481, 488, 488, 488–489, 491, 491, 491–492, 494
   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/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/lib-asset
   LibAsset.sol100%100%100%100%
packages/marketplace/contracts/lib-bp
   BpLibrary.sol0%100%0%0%13
packages/marketplace/contracts/lib-order
   LibMath.sol27.50%18.75%50%30%100–103, 17–18, 33–34, 50, 50, 50–51, 72, 72, 72–73, 75, 88, 88, 88–89, 93, 93, 93, 93, 93, 97
   LibOrder.sol66.67%50%100%72.73%105, 105, 107, 107, 41–43, 54, 66
   LibOrderData.sol100%100%100%100%
packages/marketplace/contracts/lib-part
   LibPart.sol0%100%0%0%21
packages/marketplace/contracts/royalties
   IERC2981.sol100%100%100%100%
   LibRoyalties2981.sol35.71%25%100%33.33%19, 22–23, 23, 23–27
packages/marketplace/contracts/royalties-registry
   IMultiRoyaltyRecipients.sol100%100%100%100%
   RoyaltiesRegistry.sol69.92%67.65%92.86%66.67%154, 160, 160, 160–161, 164, 164, 164–165, 168, 196–197, 206, 210, 226–227, 230–238, 241, 241, 241–242, 244, 250, 253, 267–268, 270, 54
packages/marketplace/contracts/transfer-manager
   TransferExecutor.sol27.18%21.74%80%26.92%102, 105–106, 111–112, 112, 112–113, 113, 113–114, 116, 119–120, 125–126, 126, 126–127, 135, 145–146, 150, 160, 194, 194, 194–195, 195, 195–196, 200–201, 201–202, 206, 52–54, 61–62, 62, 62, 66, 69–70, 74, 74–75, 75, 75–76, 78, 78, 80–82, 84, 90, 90, 90–91, 91, 91–92, 92, 92, 95–96, 96, 96–97, 97, 97
   TransferManager.sol61.69%53.57%83.33%63.95%115, 119–120, 152–154, 154, 154–155, 190–192, 192, 192–193, 193, 193–194, 200–201, 201, 201–202, 206, 220–221, 225–227, 231, 255–258, 258, 258–259, 275, 279–281, 281, 281–283, 288–289, 303, 312, 312, 312–314, 316–317, 83–84
packages/marketplace/contracts/transfer-manager/interfaces
   IRoyaltyUGC.sol100%100%100%100%
   ITransferExecutor.sol100%100%100%100%
   ITransferManager.sol100%100%100%100%
packages/marketplace/contracts/transfer-manager/lib
   

Please sign in to comment.