From b8f52dba0ffc853dff82ab18b714d68888d05aca Mon Sep 17 00:00:00 2001
From: perissology <perissology@protonmail.com>
Date: Sat, 16 Jun 2018 12:04:36 -0700
Subject: [PATCH] export deployLP test helper

---
 index.js                 | 46 +++++---------------------------------
 js/contracts.js          | 48 ++++++++++++++++++++++++++++++++++++++++
 test/LPVault.js          |  3 +--
 test/NormalOperation.js  |  3 +--
 test/helpers/deployLP.js |  4 ++--
 5 files changed, 57 insertions(+), 47 deletions(-)
 create mode 100644 js/contracts.js

diff --git a/index.js b/index.js
index 92f36b7..a8f7d64 100644
--- a/index.js
+++ b/index.js
@@ -1,43 +1,7 @@
-const LPFactoryArtifact = require('./build/LPFactory.json');
-const LiquidPledgingArtifact = require('./build/LiquidPledging.json');
-const LPVaultArtifact = require('./build/LPVault.json');
-const KernelArtifact = require('./build/Kernel.json');
-const ACLArtifact = require('./build/ACL.json');
-const StandardTokenTestAtifact = require('./build/StandardToken.json');
-const LiquidPledgingMockArtifact = require('./build/LiquidPledgingMock.json');
 const generateClass = require('eth-contract-class').default;
 
-module.exports = {
-  LiquidPledging: generateClass(
-    LiquidPledgingArtifact.compilerOutput.abi,
-    LiquidPledgingArtifact.compilerOutput.evm.bytecode.object,
-  ),
-  LPFactory: generateClass(
-    LPFactoryArtifact.compilerOutput.abi,
-    LPFactoryArtifact.compilerOutput.evm.bytecode.object,
-  ),
-  LiquidPledgingState: require('./lib/liquidPledgingState.js'),
-  LPVault: generateClass(
-    LPVaultArtifact.compilerOutput.abi,
-    LPVaultArtifact.compilerOutput.evm.bytecode.object,
-  ),
-  Kernel: generateClass(
-    KernelArtifact.compilerOutput.abi,
-    KernelArtifact.compilerOutput.evm.bytecode.object,
-  ),
-  ACL: generateClass(
-    ACLArtifact.compilerOutput.abi,
-    ACLArtifact.compilerOutput.evm.bytecode.object,
-  ),
-  test: {
-    StandardTokenTest: generateClass(
-      StandardTokenTestAtifact.compilerOutput.abi,
-      StandardTokenTestAtifact.compilerOutput.evm.bytecode.object,
-    ),
-    assertFail: require('./test/helpers/assertFail'),
-    LiquidPledgingMock: generateClass(
-      LiquidPledgingMockArtifact.compilerOutput.abi,
-      LiquidPledgingMockArtifact.compilerOutput.evm.bytecode.object,
-    ),
-  },
-};
+const contracts = require('./js/contracts');
+contracts.test.assertFail = require('./test/helpers/assertFail');
+contracts.test.deployLP = require('./test/helpers/deployLP');
+
+module.exports = contracts;
\ No newline at end of file
diff --git a/js/contracts.js b/js/contracts.js
new file mode 100644
index 0000000..9d2a37a
--- /dev/null
+++ b/js/contracts.js
@@ -0,0 +1,48 @@
+const generateClass = require('eth-contract-class').default;
+
+const LPFactoryArtifact = require('../build/LPFactory.json');
+const LiquidPledgingArtifact = require('../build/LiquidPledging.json');
+const LPVaultArtifact = require('../build/LPVault.json');
+const KernelArtifact = require('../build/Kernel.json');
+const ACLArtifact = require('../build/ACL.json');
+const StandardTokenTestAtifact = require('../build/StandardToken.json');
+const LiquidPledgingMockArtifact = require('../build/LiquidPledgingMock.json');
+const RecoveryVaultArtifact = require('../build/RecoveryVault.json');
+
+module.exports = {
+  LiquidPledging: generateClass(
+    LiquidPledgingArtifact.compilerOutput.abi,
+    LiquidPledgingArtifact.compilerOutput.evm.bytecode.object,
+  ),
+  LPFactory: generateClass(
+    LPFactoryArtifact.compilerOutput.abi,
+    LPFactoryArtifact.compilerOutput.evm.bytecode.object,
+  ),
+  LiquidPledgingState: require('../lib/liquidPledgingState.js'),
+  LPVault: generateClass(
+    LPVaultArtifact.compilerOutput.abi,
+    LPVaultArtifact.compilerOutput.evm.bytecode.object,
+  ),
+  Kernel: generateClass(
+    KernelArtifact.compilerOutput.abi,
+    KernelArtifact.compilerOutput.evm.bytecode.object,
+  ),
+  ACL: generateClass(
+    ACLArtifact.compilerOutput.abi,
+    ACLArtifact.compilerOutput.evm.bytecode.object,
+  ),
+  test: {
+    RecoveryVault: generateClass(
+      RecoveryVaultArtifact.compilerOutput.abi,
+      RecoveryVaultArtifact.compilerOutput.evm.bytecode.object,
+    ),
+    StandardTokenTest: generateClass(
+      StandardTokenTestAtifact.compilerOutput.abi,
+      StandardTokenTestAtifact.compilerOutput.evm.bytecode.object,
+    ),
+    LiquidPledgingMock: generateClass(
+      LiquidPledgingMockArtifact.compilerOutput.abi,
+      LiquidPledgingMockArtifact.compilerOutput.evm.bytecode.object,
+    ),
+  },
+};
diff --git a/test/LPVault.js b/test/LPVault.js
index 3329bb6..3d9f02b 100644
--- a/test/LPVault.js
+++ b/test/LPVault.js
@@ -4,9 +4,8 @@ const TestRPC = require('ganache-cli');
 const Web3 = require('web3');
 const { assert } = require('chai');
 const { LPVault, LPFactory, LiquidPledgingState, Kernel, ACL, test } = require('../index');
-const { RecoveryVault } = require('../build/contracts');
 
-const { StandardTokenTest, assertFail, LiquidPledgingMock } = test;
+const { StandardTokenTest, assertFail, LiquidPledgingMock, RecoveryVault } = test;
 
 describe('LPVault test', function() {
   this.timeout(0);
diff --git a/test/NormalOperation.js b/test/NormalOperation.js
index 7adf092..f5de2f4 100644
--- a/test/NormalOperation.js
+++ b/test/NormalOperation.js
@@ -4,9 +4,8 @@ const Ganache = require('ganache-cli');
 const Web3 = require('web3');
 const { assert } = require('chai');
 const { LPVault, LPFactory, LiquidPledgingState, Kernel, ACL, test } = require('../index');
-const { RecoveryVault } = require('../build/contracts');
 
-const { StandardTokenTest, assertFail, LiquidPledgingMock } = test;
+const { StandardTokenTest, assertFail, LiquidPledgingMock, RecoveryVault } = test;
 const { utils } = Web3;
 
 const printState = async liquidPledgingState => {
diff --git a/test/helpers/deployLP.js b/test/helpers/deployLP.js
index a9cd1c2..74cad96 100644
--- a/test/helpers/deployLP.js
+++ b/test/helpers/deployLP.js
@@ -1,5 +1,5 @@
-const { LPVault, LPFactory, LiquidPledgingState, Kernel, ACL, test } = require('../../index');
-const { RecoveryVault } = require('../../build/contracts');
+const { LPVault, LPFactory, LiquidPledgingState, Kernel, ACL, test } = require('../../js/contracts');
+const { RecoveryVault } = test;
 
 module.exports = async web3 => {
   const accounts = await web3.eth.getAccounts();