Pass factory address to bounty

contracts/test-helpers/InsecureTargetMock.sol

@@ -6,7 +6,7 @@ contract InsecureTargetMock {
   }
 }
 
-contract Deployer {
+contract InsecureTargetFactory {
   function deployContract() returns (address) {
     return new InsecureTargetMock();
   }

contracts/test-helpers/SecureTargetMock.sol

@@ -6,7 +6,7 @@ contract SecureTargetMock {
   }
 }
 
-contract Deployer {
+contract SecureTargetFactory {
   function deployContract() returns (address) {
     return new SecureTargetMock();
   }

migrations/2_deploy_contracts.js

@@ -7,7 +7,7 @@ module.exports = function(deployer) {
   deployer.deploy(Ownable);
   deployer.deploy(LimitFunds);
   if(deployer.network == 'test'){
-    deployer.deploy(SecureTargetMock);
-    deployer.deploy(InsecureTargetMock);
+    deployer.deploy(SecureTargetFactory);
+    deployer.deploy(InsecureTargetFactory);
   };
 };

test/Bounty.js

@@ -11,17 +11,17 @@ contract('Bounty', function(accounts) {
       then(done);
   })
 
-  it.only("can call checkInvariant for SecureTargetMock", function(done){
+  it("can call checkInvariant for SecureTargetMock", function(done){
     var bounty;
-    var target = SecureTargetMock.deployed();
-    SimpleTokenBounty.new(target.address).
+    var targetFactory = SecureTargetFactory.deployed();
+    SimpleTokenBounty.new(targetFactory.address).
       then(function(_bounty) {
         bounty = _bounty;
-        return bounty.createTarget.sendTransaction({gas:200000});
+        return bounty.createTarget();
+      }).
+      then(function() {
+        return bounty.checkInvariant.call()
       }).
-      // then(function() {
-      //   return bounty.checkInvariant.call()
-      // }).
       then(function(result) {
         assert.isTrue(result);
       }).
@@ -29,9 +29,13 @@ contract('Bounty', function(accounts) {
   })
 
   it("can call checkInvariant for InsecureTargetMock", function(done){
-    var bounty = SimpleTokenBounty.deployed();
-    var target = InsecureTargetMock.deployed();
-    bounty.createTarget(target.address).
+    var bounty;
+    var targetFactory = InsecureTargetFactory.deployed();
+    SimpleTokenBounty.new(targetFactory.address).
+      then(function(_bounty) {
+        bounty = _bounty;
+        return bounty.createTarget();
+      }).
       then(function() {
         return bounty.checkInvariant.call()
       }).