crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use BlockParamLiteral.Latest

Browse Source
This commit is contained in:
Leonid Logvinov 2018-05-22 11:10:03 -07:00
parent 83c37c6a7a
commit 0c53d276f8
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/sol-cov/src/coverage_subprovider.ts
View File

@ -8,7 +8,7 @@ import { AbstractArtifactAdapter } from './artifact_adapters/abstract_artifact_a
import { constants } from './constants'; import { constants } from './constants';
import { CoverageManager } from './coverage_manager'; import { CoverageManager } from './coverage_manager';
import { getTracesByContractAddress } from './trace'; import { getTracesByContractAddress } from './trace';
import { TraceInfoExistingContract, TraceInfoNewContract } from './types'; import { BlockParamLiteral, TraceInfoExistingContract, TraceInfoNewContract } from './types';
interface MaybeFakeTxData extends TxData { interface MaybeFakeTxData extends TxData {
isFakeTransaction?: boolean; isFakeTransaction?: boolean;
@ -89,7 +89,7 @@ export class CoverageSubprovider extends Subprovider {
} else { } else {
const payload = { const payload = {
method: 'eth_getBlockByNumber', method: 'eth_getBlockByNumber',
params: ['latest', true], params: [BlockParamLiteral.Latest, true],
}; };
const jsonRPCResponsePayload = await this.emitPayloadAsync(payload); const jsonRPCResponsePayload = await this.emitPayloadAsync(payload);
const transactions = jsonRPCResponsePayload.result.transactions; const transactions = jsonRPCResponsePayload.result.transactions;
@ -136,7 +136,7 @@ export class CoverageSubprovider extends Subprovider {
} else { } else {
const tracesByContractAddress = getTracesByContractAddress(trace.structLogs, address); const tracesByContractAddress = getTracesByContractAddress(trace.structLogs, address);
for (const subcallAddress of _.keys(tracesByContractAddress)) { for (const subcallAddress of _.keys(tracesByContractAddress)) {
payload = { method: 'eth_getCode', params: [subcallAddress, 'latest'] }; payload = { method: 'eth_getCode', params: [subcallAddress, BlockParamLiteral.Latest] };
const runtimeBytecode = (await this.emitPayloadAsync(payload)).result; const runtimeBytecode = (await this.emitPayloadAsync(payload)).result;
const traceForThatSubcall = tracesByContractAddress[subcallAddress]; const traceForThatSubcall = tracesByContractAddress[subcallAddress];
const coveredPcs = _.map(traceForThatSubcall, log => log.pc); const coveredPcs = _.map(traceForThatSubcall, log => log.pc);
@ -178,7 +178,7 @@ export class CoverageSubprovider extends Subprovider {
private async _getContractCodeAsync(address: string): Promise<string> { private async _getContractCodeAsync(address: string): Promise<string> {
const payload = { const payload = {
method: 'eth_getCode', method: 'eth_getCode',
params: [address, 'latest'], params: [address, BlockParamLiteral.Latest],
}; };
const jsonRPCResponsePayload = await this.emitPayloadAsync(payload); const jsonRPCResponsePayload = await this.emitPayloadAsync(payload);
const contractCode: string = jsonRPCResponsePayload.result; const contractCode: string = jsonRPCResponsePayload.result;

4
packages/sol-cov/src/types.ts
View File

@ -98,3 +98,7 @@ export interface TraceInfoExistingContract extends TraceInfoBase {
} }
export type TraceInfo = TraceInfoNewContract | TraceInfoExistingContract; export type TraceInfo = TraceInfoNewContract | TraceInfoExistingContract;
export enum BlockParamLiteral {
Latest = 'latest',
}