fix: fix broken rebase

bob-collective · Dec 12, 2023 · 5955c04 · 5955c04
1 parent dfa0463
commit 5955c04
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/script/Marketplace.sol b/script/Marketplace.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.13;
 import {Script, console2} from "forge-std/Script.sol";
 import {BtcMarketPlace} from "../src/swap/Btc_Marketplace.sol";
 import {MarketPlace} from "../src/swap/Marketplace.sol";
-import {DummyRelay} from "../src/relay/DummyRelay.sol";
+import {TestLightRelay} from "../src/relay/TestLightRelay.sol";
 
 contract MarketplaceScript is Script {
     function setUp() public {}
@@ -15,7 +15,7 @@ contract MarketplaceScript is Script {
         address forwarder = vm.envAddress("FORWARDER_ADDRESS");
 
         vm.startBroadcast(deployerPrivateKey);
-        BtcMarketPlace btcMarketplace = new BtcMarketPlace(new DummyRelay(), forwarder);
+        BtcMarketPlace btcMarketplace = new BtcMarketPlace(new TestLightRelay(), forwarder);
         MarketPlace marketplace = new MarketPlace(forwarder);
 
         vm.stopBroadcast();

diff --git a/src/faucet/Erc20Minter.sol b/src/faucet/Erc20Minter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.18;
+pragma solidity ^0.8.13;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 

diff --git a/test/swap/Btc_Marketplace.t.sol b/test/swap/Btc_Marketplace.t.sol
@@ -28,7 +28,7 @@ contract MarketPlaceTest is BtcMarketPlace, Test {
     ArbitaryErc20 token1;
     TestLightRelay testLightRelay;
 
-    constructor() BtcMarketPlace(testLightRelay) {}
+    constructor() BtcMarketPlace(testLightRelay, address(0x00)) {}
 
     function setUp() public {
         utils = new Utilities();