Merge pull request #5665 from trufflesuite/drop/ethpm-v1

Remove ethpm-v1 concerns
trufflesuite · Nov 3, 2022 · 7066f6f · 7066f6f
2 parents e36fbbe + 3a31e15
commit 7066f6f
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 164 deletions.
diff --git a/packages/compile-solidity-tests/test/parser.ts b/packages/compile-solidity-tests/test/parser.ts
@@ -11,7 +11,6 @@ describe("Parser", () => {
     "./Dependency.sol",
     "./path/to/AnotherDep.sol",
     "../../../path/to/AnotherDep.sol",
-    "ethpmpackage/Contract.sol",
     "./somePath.sol",
     "./someImportWithNoSpace.sol",
     "../../someRelativeMultilineImport.sol",

diff --git a/packages/compile-solidity-tests/test/sources/v0.4.15/MyContract.sol b/packages/compile-solidity-tests/test/sources/v0.4.15/MyContract.sol
@@ -4,7 +4,6 @@ pragma solidity >0.4.15;
 import "./Dependency.sol";
 import "./path/to/AnotherDep.sol";
 import "../../../path/to/AnotherDep.sol";
-import "ethpmpackage/Contract.sol";
 import { Something as MyGarbage } from "./somePath.sol";
 import"./someImportWithNoSpace.sol";
 import {

diff --git a/packages/config/src/configDefaults.ts b/packages/config/src/configDefaults.ts
@@ -47,13 +47,6 @@ export const getInitialConfig = ({
       port: 24012,
       verbose: false
     },
-    ethpm: {
-      ipfs_host: "ipfs.infura.io",
-      ipfs_protocol: "https",
-      registry: "0x8011df4830b4f696cd81393997e5371b93338878",
-      install_provider_uri:
-        "https://ropsten.infura.io/v3/26e88e46be924823983710becd929f36"
-    },
     ens: {
       enabled: false,
       registryAddress: null
@@ -104,7 +97,6 @@ export const configProps = ({
     resolver() {},
     artifactor() {},
     dashboard() {},
-    ethpm() {},
     logger() {},
     compilers() {},
     ens() {},

diff --git a/packages/resolver/lib/resolver.ts b/packages/resolver/lib/resolver.ts
@@ -6,7 +6,7 @@ const expect = require("@truffle/expect");
 const provision = require("@truffle/provisioner");
 
 import type { ResolverSource, ResolvedSource } from "./source";
-import { EthPMv1, NPM, GlobalNPM, FS, Truffle, ABI, Vyper } from "./sources";
+import { NPM, GlobalNPM, FS, Truffle, ABI, Vyper } from "./sources";
 
 export interface ResolverOptions {
   includeTruffleSources?: boolean;
@@ -28,7 +28,6 @@ export class Resolver {
     this.options = options;
 
     let basicSources: ResolverSource[] = [
-      new EthPMv1(options.working_directory),
       new NPM(options.working_directory),
       new GlobalNPM(),
       new FS(options.working_directory, options.contracts_build_directory)

diff --git a/packages/resolver/lib/sources/ethpm-v1.ts b/packages/resolver/lib/sources/ethpm-v1.ts
diff --git a/packages/resolver/lib/sources/index.ts b/packages/resolver/lib/sources/index.ts
@@ -1,4 +1,3 @@
-export { EthPMv1 } from "./ethpm-v1";
 export { NPM } from "./npm";
 export { GlobalNPM } from "./globalnpm";
 export { FS } from "./fs";

diff --git a/packages/truffle/test/scenarios/resolver/resolver.js b/packages/truffle/test/scenarios/resolver/resolver.js
@@ -26,10 +26,6 @@ describe("Solidity Imports [ @standalone ]", function () {
    * |   |-- ImportOfImport.sol # Local import for NodeImport.sol
    * |   |-- NodeImport.sol
    * |
-   * + installed_contracts/
-   * |-- ethpmpkg/
-   * |   |-- EthPMImport.sol
-   * |
    * + truffleproject/
    * |-- contracts/
    * |   |-- Importer.sol # This imports everthing
@@ -66,7 +62,6 @@ describe("Solidity Imports [ @standalone ]", function () {
       const output = logger.contents();
 
       assert(output.includes("./contracts/Importer.sol"));
-      assert(output.includes("ethpmpkg/EthPMImport.sol"));
       assert(output.includes("nodepkg/ImportOfImport.sol"));
       assert(output.includes("nodepkg/LocalNodeImport.sol"));
       assert(output.includes("nodepkg/NodeImport.sol"));

diff --git a/packages/truffle/test/sources/monorepo/installed_contracts/ethpmpkg/EthPMImport.sol b/packages/truffle/test/sources/monorepo/installed_contracts/ethpmpkg/EthPMImport.sol
diff --git a/packages/truffle/test/sources/monorepo/truffleproject/contracts/Importer.sol b/packages/truffle/test/sources/monorepo/truffleproject/contracts/Importer.sol
@@ -2,9 +2,8 @@ pragma solidity ^0.5.0;
 
 import "nodepkg/LocalNodeImport.sol";
 import "nodepkg/NodeImport.sol";
-import "ethpmpkg/EthPMImport.sol";
 
-contract Importer is LocalNodeImport, NodeImport, EthPMImport {
+contract Importer is LocalNodeImport, NodeImport {
   uint local;
   constructor() public {}
 }