Update tests and test contracts

implementation/test/KeepBridgeTest.js

@@ -138,15 +138,4 @@ contract('KeepBridge', (accounts) => {
       )
     })
   })
-
-  describe('requestNewKeep()', async () => {
-    it('sends caller as owner to open new keep', async () => {
-      const expectedKeepOwner = accounts[2]
-
-      await keepBridge.requestNewKeep(5, 10, { from: expectedKeepOwner })
-      const keepOwner = await ecdsaKeepVendor.keepOwner.call()
-
-      assert.equal(expectedKeepOwner, keepOwner, 'incorrect keep owner address')
-    })
-  })
 })

implementation/test/TBTCSystemTest.js

@@ -0,0 +1,37 @@
+const TBTCSystem = artifacts.require('TBTCSystem')
+const KeepRegistryStub = artifacts.require('KeepRegistryStub')
+const ECDSAKeepVendorStub = artifacts.require('ECDSAKeepVendorStub')
+
+contract('TBTCSystem', (accounts) => {
+  let tbtcSystem
+  let ecdsaKeepVendor
+
+  before(async () => {
+    ecdsaKeepVendor = await ECDSAKeepVendorStub.new()
+
+    const keepRegistry = await KeepRegistryStub.new()
+    await keepRegistry.setVendor(ecdsaKeepVendor.address)
+
+    tbtcSystem = await TBTCSystem.deployed()
+    await tbtcSystem.initialize(keepRegistry.address)
+  })
+
+  describe('requestNewKeep()', async () => {
+    it('sends caller as owner to open new keep', async () => {
+      const expectedKeepOwner = accounts[2]
+
+      await tbtcSystem.requestNewKeep(5, 10, { from: expectedKeepOwner })
+      const keepOwner = await ecdsaKeepVendor.keepOwner.call()
+
+      assert.equal(expectedKeepOwner, keepOwner, 'incorrect keep owner address')
+    })
+
+    it('returns keep address', async () => {
+      const expectedKeepAddress = '0x0000000000000000000000000000000000000378'
+
+      const result = await tbtcSystem.requestNewKeep.call(5, 10)
+
+      assert.equal(expectedKeepAddress, result, 'incorrect keep address')
+    })
+  })
+})

implementation/test/contracts/deposit/KeepStub.sol

@@ -51,11 +51,6 @@ contract KeepStub {
         return success;
     }
 
-    function requestNewKeep(uint256 _m, uint256 _n) external payable returns (address _keepAddress) {
-        _m; _n;
-        return keepAddress;
-    }
-
     function getKeepPubkey(address _keepAddress) external view returns (bytes memory) {
         _keepAddress; success;
         // this is the pubkey coresponding to 32 '11' bytes

implementation/test/contracts/deposit/TBTCSystemStub.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.5.10;
 import {TBTCSystem} from '../../../contracts/system/TBTCSystem.sol';
 
 contract TBTCSystemStub is TBTCSystem {
+    address keepAddress = address(7);
 
     function setOraclePrice(uint256 _oraclePrice) external {
         oraclePrice = _oraclePrice;
@@ -20,4 +21,9 @@ contract TBTCSystemStub is TBTCSystem {
     function approvedToLog(address _caller) public view returns (bool) {
         _caller; return true;
     }
+
+    function requestNewKeep(uint256 _m, uint256 _n) external payable returns (address _keepAddress) {
+        _m; _n;
+        return keepAddress;
+    }
 }

implementation/test/contracts/keep/ECDSAKeepVendorStub.sol

@@ -14,5 +14,6 @@ contract ECDSAKeepVendorStub is ECDSAKeepVendor {
         address _owner
     ) external payable returns (address _keepAddress) {
         keepOwner = _owner;
+        _keepAddress = address(888);
     }
 }