Added changes

Signed-off-by: Christopher Maree <[email protected]>
UMAprotocol · Dec 22, 2020 · 57c91f9 · 57c91f9
1 parent 463a22e
commit 57c91f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/packages/core/index.js b/packages/core/index.js
@@ -102,14 +102,9 @@ function getAddressTest(contractName, networkId, version = "latest") {
 
   if (truffleContract.networks[networkId]) {
     return truffleContract.networks[networkId].address;
-  } else if (
-    global.artifacts._provisioner &&
-    global.artifacts._provisioner._deploymentAddresses[contractName] &&
-    artifacts._provisioner._networkConfig.chainId === networkId
-  ) {
-    // In the buidler case, there is no networks object, so we fall back to buidler's global list of deployed addresses as long as buidler's network id matches the one passed in.
-    // Note: this is a bit hacky because it depends on internal buidler details.
-    return global.artifacts._provisioner._deploymentAddresses[contractName];
+  } else if (global.hardhatTestingAddresses[contractName]) {
+    // If running in tests in hardhat check if there is a testing address set.
+    return global.hardhatTestingAddresses[contractName];
   } else {
     throw new Error(`No address found for contract ${contractName} on network ${networkId}`);
   }

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uma/core",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "UMA smart contracts and unit tests",
   "dependencies": {
     "@truffle/contract": "^4.2.20",