Remove unused types and merge ContractsIdentifier with VmTraceDecoder

Author: Xanewok

packages/hardhat-core/src/internal/hardhat-network/provider/provider.ts

@@ -43,7 +43,6 @@ import { isErrorResponse } from "../../core/providers/http";
 import { getHardforkName } from "../../util/hardforks";
 import { createModelsAndDecodeBytecodes } from "../stack-traces/compiler-to-model";
 import { ConsoleLogger } from "../stack-traces/consoleLogger";
-import { ContractsIdentifier } from "../stack-traces/contracts-identifier";
 import {
   VmTraceDecoder,
   initializeVmTraceDecoder,
@@ -223,8 +222,7 @@ export class EdrProviderWrapper
     const printLineFn = loggerConfig.printLineFn ?? printLine;
     const replaceLastLineFn = loggerConfig.replaceLastLineFn ?? replaceLastLine;
 
-    const contractsIdentifier = new ContractsIdentifier();
-    const vmTraceDecoder = new VmTraceDecoder(contractsIdentifier);
+    const vmTraceDecoder = new VmTraceDecoder();
 
     const hardforkName = getHardforkName(config.hardfork);
 
@@ -551,7 +549,7 @@ export class EdrProviderWrapper
       );
 
       log(
-        "ContractsIdentifier failed to be updated. Please report this to help us improve Hardhat.\n",
+        "VmTraceDecoder failed to be updated. Please report this to help us improve Hardhat.\n",
         error
       );
 

packages/hardhat-core/src/internal/hardhat-network/stack-traces/contracts-identifier.ts

@@ -1,10 +1,4 @@
-import type { Bytecode } from "./model";
 import type {
-  CallOutput,
-  CreateOutput,
-  HaltResult,
-  RevertResult,
-  SuccessResult,
   PrecompileMessageTrace,
   CreateMessageTrace,
   CallMessageTrace,
@@ -16,86 +10,3 @@ export type MessageTrace =
   | CreateMessageTrace
   | CallMessageTrace
   | PrecompileMessageTrace;
-
-export type EvmMessageTrace = CreateMessageTrace | CallMessageTrace;
-
-export type DecodedEvmMessageTrace =
-  | DecodedCreateMessageTrace
-  | DecodedCallMessageTrace;
-
-export interface DecodedCreateMessageTrace extends CreateMessageTrace {
-  bytecode: Bytecode;
-}
-
-export interface DecodedCallMessageTrace extends CallMessageTrace {
-  bytecode: Bytecode;
-}
-
-export function isPrecompileTrace(
-  trace: MessageTrace
-): trace is PrecompileMessageTrace {
-  return "precompile" in trace;
-}
-
-export function isCreateTrace(
-  trace: MessageTrace
-): trace is CreateMessageTrace {
-  return "code" in trace && !isCallTrace(trace);
-}
-
-export function isDecodedCreateTrace(
-  trace: MessageTrace
-): trace is DecodedCreateMessageTrace {
-  return isCreateTrace(trace) && trace.bytecode !== undefined;
-}
-
-export function isCallTrace(trace: MessageTrace): trace is CallMessageTrace {
-  return "code" in trace && "calldata" in trace;
-}
-
-export function isDecodedCallTrace(
-  trace: MessageTrace
-): trace is DecodedCallMessageTrace {
-  return isCallTrace(trace) && trace.bytecode !== undefined;
-}
-
-export function isEvmStep(step: MessageTraceStep): step is EvmStep {
-  return "pc" in step && step.pc !== undefined;
-}
-
-export type MessageTraceStep = MessageTrace | EvmStep;
-
-export interface EvmStep {
-  pc: number;
-}
-
-export function isCallOutput(
-  output: CallOutput | CreateOutput
-): output is CallOutput {
-  return !isCreateOutput(output);
-}
-
-export function isCreateOutput(
-  output: CallOutput | CreateOutput
-): output is CreateOutput {
-  return "address" in output;
-}
-
-export function isSuccessResult(
-  result: SuccessResult | RevertResult | HaltResult
-): result is SuccessResult {
-  // Only need to check for one unique field
-  return "gasRefunded" in result;
-}
-
-export function isRevertResult(
-  result: SuccessResult | RevertResult | HaltResult
-): result is RevertResult {
-  return !("reason" in result);
-}
-
-export function isHaltResult(
-  result: SuccessResult | RevertResult | HaltResult
-): result is HaltResult {
-  return !("output" in result);
-}

packages/hardhat-core/src/internal/hardhat-network/stack-traces/error-inferrer.ts

@@ -20,7 +20,7 @@ function initializeVmTraceDecoderWrapper(
     );
 
     log(
-      "Hardhat Network tracing disabled: ContractsIdentifier failed to be initialized. Please report this to help us improve Hardhat.\n",
+      "Hardhat Network tracing disabled: VmTraceDecoder failed to be initialized. Please report this to help us improve Hardhat.\n",
       error
     );