From 7fab7829071f5b60a6dad058c5a7b6d56f607b97 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 17 May 2018 14:07:55 +0200 Subject: Improve naming --- packages/sol-compiler/test/compiler_test.ts | 7 ++++--- packages/utils/src/abi_decoder.ts | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'packages') 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); }); }); diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts index 654c7753b..c78bfa343 100644 --- a/packages/utils/src/abi_decoder.ts +++ b/packages/utils/src/abi_decoder.ts @@ -23,8 +23,8 @@ export class AbiDecoder { formatted = formatted.slice(2); } - const desiredLength = 40; - formatted = _.padStart(formatted, desiredLength, '0'); + const addressLength = 40; + formatted = _.padStart(formatted, addressLength, '0'); return `0x${formatted}`; } constructor(abiArrays: AbiDefinition[][]) { -- cgit v1.2.3