Resolve conflicts

Author: Filip-L

test/PoRepMarket.t.sol

@@ -411,7 +411,7 @@ contract PoRepMarketTest is Test {
         spRegistry.setNextAutoApprove(true);
 
         vm.prank(clientAddress);
-        poRepMarket.proposeDeal(defaultRequirements, defaultTerms);
+         poRepMarket.proposeDeal(defaultRequirements, defaultTerms, expectedManifestLocation);
 
         PoRepMarket.DealProposal memory p = poRepMarket.getDealProposal(dealId);
         assertTrue(p.state == PoRepMarket.DealState.Accepted);
@@ -422,48 +422,17 @@ contract PoRepMarketTest is Test {
 
         vm.prank(clientAddress);
         vm.expectEmit(true, true, true, true);
-        emit PoRepMarket.DealProposalCreated(dealId, clientAddress, providerFilActorId, defaultRequirements);
+        emit PoRepMarket.DealProposalCreated(dealId, clientAddress, providerFilActorId, defaultRequirements, expectedManifestLocation);
         vm.expectEmit(true, true, true, true);
         emit PoRepMarket.DealAccepted(dealId, clientAddress, providerFilActorId);
-        poRepMarket.proposeDeal(defaultRequirements, defaultTerms);
+         poRepMarket.proposeDeal(defaultRequirements, defaultTerms, expectedManifestLocation);
     }
 
     function testProposeDealNoAutoApproveKeepsProposed() public {
         spRegistry.setNextAutoApprove(false);
 
         vm.prank(clientAddress);
-        poRepMarket.proposeDeal(defaultRequirements, defaultTerms);
-
-        PoRepMarket.DealProposal memory p = poRepMarket.getDealProposal(dealId);
-        assertTrue(p.state == PoRepMarket.DealState.Proposed);
-    }
-
-    function testProposeDealAutoApproveSetsDealToAccepted() public {
-        spRegistry.setNextAutoApprove(true);
-
-        vm.prank(clientAddress);
-        poRepMarket.proposeDeal(defaultRequirements, defaultTerms);
-
-        PoRepMarket.DealProposal memory p = poRepMarket.getDealProposal(dealId);
-        assertTrue(p.state == PoRepMarket.DealState.Accepted);
-    }
-
-    function testProposeDealAutoApproveEmitsBothEvents() public {
-        spRegistry.setNextAutoApprove(true);
-
-        vm.prank(clientAddress);
-        vm.expectEmit(true, true, true, true);
-        emit PoRepMarket.DealProposalCreated(dealId, clientAddress, providerFilActorId, defaultRequirements);
-        vm.expectEmit(true, true, true, true);
-        emit PoRepMarket.DealAccepted(dealId, clientAddress, providerFilActorId);
-        poRepMarket.proposeDeal(defaultRequirements, defaultTerms);
-    }
-
-    function testProposeDealNoAutoApproveKeepsProposed() public {
-        spRegistry.setNextAutoApprove(false);
-
-        vm.prank(clientAddress);
-        poRepMarket.proposeDeal(defaultRequirements, defaultTerms);
+         poRepMarket.proposeDeal(defaultRequirements, defaultTerms, expectedManifestLocation);
 
         PoRepMarket.DealProposal memory p = poRepMarket.getDealProposal(dealId);
         assertTrue(p.state == PoRepMarket.DealState.Proposed);