allow artifacts.require to return unmodified contracts

d18e7e7a · Francisco Giordano · 2423440d · d18e7e7a
Commit d18e7e7a authored Nov 10, 2020 by Francisco Giordano
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

env-artifacts.js buidler/env-artifacts.js +6 -3

No files found.
--- a/buidler/env-artifacts.js
+++ b/buidler/env-artifacts.js
@@ -6,15 +6,18 @@ extendEnvironment(env => {
  env.artifacts = {
    ...artifacts,
    require (name) {
+      for (const suffix of ['UpgradeSafeWithInit', 'UpgradeSafe', '']) {
        try {
-        return artifacts.require(name + 'UpgradeSafeWithInit');
+          return artifacts.require(name + suffix);
        } catch (e) {
-        if (BuidlerError.isBuidlerError(e) && e.number === 700) {
+          if (BuidlerError.isBuidlerError(e) && e.number === 700 && suffix !== '') {
-          return artifacts.require(name + 'UpgradeSafe');
+            continue;
          } else {
            throw e;
          }
        }
+      }
+      throw new Error('Unreachable');
    },
  };
 });