merge development

2 files changed, 4 insertions, 0 deletions

diff --git a/packages/sol-cov/test/collect_coverage_entries_test.ts b/packages/sol-cov/test/collect_coverage_entries_test.ts
index 82012edfa..a03be19cd 100644
--- a/packages/sol-cov/test/collect_coverage_entries_test.ts
+++ b/packages/sol-cov/test/collect_coverage_entries_test.ts
@@ -40,12 +40,14 @@ describe('Collect coverage entries', () => {
             const coverageEntries = collectCoverageEntries(simpleStorageContract);
             const fnIds = _.keys(coverageEntries.fnMap);
             expect(coverageEntries.fnMap[fnIds[0]].name).to.be.equal('set');
+            // tslint:disable-next-line:custom-no-magic-numbers
             expect(coverageEntries.fnMap[fnIds[0]].line).to.be.equal(5);
             const setFunction = `function set(uint x) {
         storedData = x;
     }`;
             expect(getRange(simpleStorageContract, coverageEntries.fnMap[fnIds[0]].loc)).to.be.equal(setFunction);
             expect(coverageEntries.fnMap[fnIds[1]].name).to.be.equal('get');
+            // tslint:disable-next-line:custom-no-magic-numbers
             expect(coverageEntries.fnMap[fnIds[1]].line).to.be.equal(8);
             const getFunction = `function get() constant returns (uint retVal) {
         return storedData;
@@ -122,6 +124,7 @@ describe('Collect coverage entries', () => {
 
             const branchDescriptions = _.values(coverageEntries.branchMap);
             const branchLines = _.map(branchDescriptions, branchDescription => branchDescription.line);
+            // tslint:disable-next-line:custom-no-magic-numbers
             expect(branchLines).to.be.deep.equal([94, 115, 119, 130, 151, 187]);
             const branchTypes = _.map(branchDescriptions, branchDescription => branchDescription.type);
             expect(branchTypes).to.be.deep.equal(['if', 'if', 'if', 'if', 'binary-expr', 'if']);
diff --git a/packages/sol-cov/test/instructions_test.ts b/packages/sol-cov/test/instructions_test.ts
index f66612f5f..8012674f5 100644
--- a/packages/sol-cov/test/instructions_test.ts
+++ b/packages/sol-cov/test/instructions_test.ts
@@ -12,6 +12,7 @@ const expect = chai.expect;
 describe('instructions', () => {
     describe('#getPcToInstructionIndexMapping', () => {
         it('correctly maps pcs to instruction indexed', () => {
+            // tslint:disable-next-line:custom-no-magic-numbers
             const bytecode = new Uint8Array([constants.PUSH1, 42, constants.PUSH2, 1, 2, constants.TIMESTAMP]);
             const pcToInstruction = getPcToInstructionIndexMapping(bytecode);
             const expectedPcToInstruction = { '0': 0, '2': 1, '5': 2 };