Revert "Allow importing ABI JSON files in Solidity"

trufflesuite · Oct 29, 2020 · e7c5529 · e7c5529
1 parent 333b6bd
commit e7c5529
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 460 deletions.
diff --git a/packages/resolver/lib/resolver.ts b/packages/resolver/lib/resolver.ts
@@ -3,7 +3,7 @@ const expect = require("@truffle/expect");
 const provision = require("@truffle/provisioner");
 
 import { ResolverSource } from "./source";
-import { EthPMv1, NPM, GlobalNPM, FS, Truffle, ABI } from "./sources";
+import { EthPMv1, NPM, GlobalNPM, FS, Truffle } from "./sources";
 
 export class Resolver {
   options: any;
@@ -17,7 +17,6 @@ export class Resolver {
       new EthPMv1(options.working_directory),
       new NPM(options.working_directory),
       new GlobalNPM(),
-      new ABI(options.working_directory, options.contracts_build_directory),
       new FS(options.working_directory, options.contracts_build_directory)
     ];
 

diff --git a/packages/resolver/lib/sources/abi.ts b/packages/resolver/lib/sources/abi.ts
diff --git a/packages/resolver/lib/sources/index.ts b/packages/resolver/lib/sources/index.ts
@@ -3,4 +3,3 @@ export { NPM } from "./npm";
 export { GlobalNPM } from "./globalnpm";
 export { FS } from "./fs";
 export { Truffle } from "./truffle";
-export { ABI } from "./abi";
diff --git a/packages/resolver/package.json b/packages/resolver/package.json
@@ -25,7 +25,6 @@
     "@truffle/contract-sources": "^0.1.8",
     "@truffle/expect": "^0.0.15",
     "@truffle/provisioner": "^0.2.9",
-    "abi-to-sol": "^0.2.0",
     "debug": "^4.1.1",
     "detect-installed": "^2.0.4",
     "get-installed-path": "^4.0.8",

diff --git a/packages/truffle/test/scenarios/commands/build.js b/packages/truffle/test/scenarios/commands/build.js
@@ -9,7 +9,7 @@ describe("truffle build [ @standalone ]", () => {
   let config, project;
 
   describe("when there is no build script in config", () => {
-    beforeEach("set up sandbox", function () {
+    beforeEach("set up sandbox", function() {
       this.timeout(10000);
       project = path.join(
         __dirname,
@@ -37,7 +37,7 @@ describe("truffle build [ @standalone ]", () => {
   });
 
   describe("when there is a proper build config", () => {
-    beforeEach("set up sandbox", function () {
+    beforeEach("set up sandbox", function() {
       this.timeout(10000);
       project = path.join(
         __dirname,
@@ -48,16 +48,15 @@ describe("truffle build [ @standalone ]", () => {
         config.logger = logger;
       });
     });
-    it("runs the build script", async function () {
-      this.timeout(10000);
+    it("runs the build script", async () => {
       await CommandRunner.run("build", config);
       const output = logger.contents();
       assert(output.includes("'this is the build script'"));
     });
   });
 
   describe("when there is an object in the build config", () => {
-    beforeEach("set up sandbox", function () {
+    beforeEach("set up sandbox", function() {
       this.timeout(10000);
       project = path.join(
         __dirname,
@@ -68,8 +67,7 @@ describe("truffle build [ @standalone ]", () => {
         config.logger = logger;
       });
     });
-    it("tells the user it shouldn't use an object", async function () {
-      this.timeout(10000);
+    it("tells the user it shouldn't use an object", async () => {
       try {
         await CommandRunner.run("build", config);
         assert(false, "The process should have exited with code 1");