diff options
author | Fabio Berger <me@fabioberger.com> | 2018-05-17 20:07:55 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-05-17 20:07:55 +0800 |
commit | 7fab7829071f5b60a6dad058c5a7b6d56f607b97 (patch) | |
tree | 3f8bb8eb9c30bbafbebaf2d306feba091ab8a5b6 | |
parent | cf7967e6296aac0a328143e92a22c5682541a576 (diff) | |
download | dexon-sol-tools-7fab7829071f5b60a6dad058c5a7b6d56f607b97.tar dexon-sol-tools-7fab7829071f5b60a6dad058c5a7b6d56f607b97.tar.gz dexon-sol-tools-7fab7829071f5b60a6dad058c5a7b6d56f607b97.tar.bz2 dexon-sol-tools-7fab7829071f5b60a6dad058c5a7b6d56f607b97.tar.lz dexon-sol-tools-7fab7829071f5b60a6dad058c5a7b6d56f607b97.tar.xz dexon-sol-tools-7fab7829071f5b60a6dad058c5a7b6d56f607b97.tar.zst dexon-sol-tools-7fab7829071f5b60a6dad058c5a7b6d56f607b97.zip |
Improve naming
-rw-r--r-- | packages/sol-compiler/test/compiler_test.ts | 7 | ||||
-rw-r--r-- | packages/utils/src/abi_decoder.ts | 4 |
2 files changed, 6 insertions, 5 deletions
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[][]) { |