From c2e117d0862b77db4a5fe372a33fa5a9b81dca36 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 28 Mar 2018 17:32:14 +0200
Subject: [PATCH] fix test

---
 remix-lib/src/execution/txFormat.js |  6 +++---
 remix-lib/test/txFormat.js          | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/remix-lib/src/execution/txFormat.js b/remix-lib/src/execution/txFormat.js
index 493e676ee8..5928f6ff29 100644
--- a/remix-lib/src/execution/txFormat.js
+++ b/remix-lib/src/execution/txFormat.js
@@ -90,7 +90,7 @@ module.exports = {
             bytecodeToDeploy = bytecode + dataHex
             return callback(null, {dataHex: bytecodeToDeploy, funAbi, funArgs, contractBytecode, contractName: contractName})
           }
-        }, callbackStep)
+        }, callbackStep, callbackDeployLibrary)
         return
       } else {
         dataHex = bytecodeToDeploy + dataHex
@@ -170,9 +170,9 @@ module.exports = {
       return callback(null, contract.evm.bytecode.object)
     }
     if (contract.evm.bytecode.linkReferences && Object.keys(contract.evm.bytecode.linkReferences).length) {
-      this.linkBytecodeStandard(contract, contracts, callback, callbackStep)
+      this.linkBytecodeStandard(contract, contracts, callback, callbackStep, callbackDeployLibrary)
     } else {
-      this.linkBytecodeLegacy(contract, contracts, callback, callbackStep)
+      this.linkBytecodeLegacy(contract, contracts, callback, callbackStep, callbackDeployLibrary)
     }
   },
 
diff --git a/remix-lib/test/txFormat.js b/remix-lib/test/txFormat.js
index 0f107e7999..736de57dcd 100644
--- a/remix-lib/test/txFormat.js
+++ b/remix-lib/test/txFormat.js
@@ -39,21 +39,21 @@ tape('ContractParameters - (TxFormat.buildData) - link Libraries', function (t)
     lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2: '0xf7a10e525d4b168f45f74db1b61f63d3e7619e33',
     testContractLinkLibrary: '0xf7a10e525d4b168f45f74db1b61f63d3e7619e22'
   }
-  var udapp = { runTx: (param, callback) => {
+  var callbackDeployLibraries = (param, callback) => {
     callback(null, {
       result: {
         createdAddress: fakeDeployedContracts[param.data.contractName]
       }
     })
-  } } // fake
-  context = { output, contract, udapp }
+  } // fake
+  context = { output, contract }
   t.test('(TxFormat.buildData and link library (standard way))', function (st) {
     st.plan(6)
-    testLinkLibrary(st, fakeDeployedContracts)
+    testLinkLibrary(st, fakeDeployedContracts, callbackDeployLibraries)
   })
 })
 
-function testLinkLibrary (st, fakeDeployedContracts) {
+function testLinkLibrary (st, fakeDeployedContracts, callbackDeployLibraries) {
   var deployMsg = ['creation of library test.sol:lib1 pending...',
   'creation of library test.sol:lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2_lib2 pending...']
   txFormat.buildData('testContractLinkLibrary', context.contract, context.output.contracts, true, context.contract.abi[0], '', (error, data) => {
@@ -70,7 +70,7 @@ function testLinkLibrary (st, fakeDeployedContracts) {
   }, (msg) => {
     st.equal(msg, deployMsg[0])
     deployMsg.shift()
-  }, () => {})
+  }, callbackDeployLibraries)
 }
 
 var uintContract = `contract uintContractTest {