From 839db68571037f6fff8273aaade6ea0bd14ea8a5 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 16 May 2018 14:59:10 +0200
Subject: Fix TSLint rules

---
 packages/sol-compiler/test/compiler_test.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'packages/sol-compiler/test/compiler_test.ts')

diff --git a/packages/sol-compiler/test/compiler_test.ts b/packages/sol-compiler/test/compiler_test.ts
index d0f121897..c7747741f 100644
--- a/packages/sol-compiler/test/compiler_test.ts
+++ b/packages/sol-compiler/test/compiler_test.ts
@@ -38,8 +38,12 @@ describe('#Compiler', function(): void {
         const exchangeArtifactString = await fsWrapper.readFileAsync(exchangeArtifactPath, opts);
         const exchangeArtifact: ContractArtifact = JSON.parse(exchangeArtifactString);
         // The last 43 bytes of the binaries are metadata which may not be equivalent
-        const unlinkedBinaryWithoutMetadata = exchangeArtifact.compilerOutput.evm.bytecode.object.slice(2, -86);
-        const exchangeBinaryWithoutMetadata = exchange_binary.slice(0, -86);
+        const last43BytesIndex = -86;
+        const unlinkedBinaryWithoutMetadata = exchangeArtifact.compilerOutput.evm.bytecode.object.slice(
+            2,
+            last43BytesIndex,
+        );
+        const exchangeBinaryWithoutMetadata = exchange_binary.slice(0, last43BytesIndex);
         expect(unlinkedBinaryWithoutMetadata).to.equal(exchangeBinaryWithoutMetadata);
     });
 });
-- 
cgit v1.2.3


From 7fab7829071f5b60a6dad058c5a7b6d56f607b97 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 17 May 2018 14:07:55 +0200
Subject: Improve naming

---
 packages/sol-compiler/test/compiler_test.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'packages/sol-compiler/test/compiler_test.ts')

diff --git a/packages/sol-compiler/test/compiler_test.ts b/packages/sol-compiler/test/compiler_test.ts
index c7747741f..324313347 100644
--- a/packages/sol-compiler/test/compiler_test.ts
+++ b/packages/sol-compiler/test/compiler_test.ts
@@ -38,12 +38,13 @@ describe('#Compiler', function(): void {
         const exchangeArtifactString = await fsWrapper.readFileAsync(exchangeArtifactPath, opts);
         const exchangeArtifact: ContractArtifact = JSON.parse(exchangeArtifactString);
         // The last 43 bytes of the binaries are metadata which may not be equivalent
-        const last43BytesIndex = -86;
+        const metadataByteLength = 43;
+        const metadataHexLength = metadataByteLength * 2;
         const unlinkedBinaryWithoutMetadata = exchangeArtifact.compilerOutput.evm.bytecode.object.slice(
             2,
-            last43BytesIndex,
+            -metadataHexLength,
         );
-        const exchangeBinaryWithoutMetadata = exchange_binary.slice(0, last43BytesIndex);
+        const exchangeBinaryWithoutMetadata = exchange_binary.slice(0, -metadataHexLength);
         expect(unlinkedBinaryWithoutMetadata).to.equal(exchangeBinaryWithoutMetadata);
     });
 });
-- 
cgit v1.2.3