fix: migrations and tests

guidiaz · Aug 5, 2024 · 7a70235 · 7a70235
1 parent 54d9f7a
commit 7a70235
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 308 deletions.
diff --git a/contracts/core/trustable/WitOracleTrustableBase.sol b/contracts/core/trustable/WitOracleTrustableBase.sol
@@ -206,8 +206,6 @@ abstract contract WitOracleTrustableBase
 
         _require(address(registry).code.length > 0, "inexistent registry");
         _require(registry.specs() == type(WitOracleRadonRegistry).interfaceId, "uncompliant registry");
-        _require(address(factory).code.length > 0, "inexistent factory");
-        _require(address(factory.witOracle()) == address(this), "discordant factory");
 
         // Set reporters, if any
         __setReporters(_newReporters);

diff --git a/contracts/core/trustless/WitOracleRadonRegistryDefault.sol b/contracts/core/trustless/WitOracleRadonRegistryDefault.sol
@@ -164,8 +164,8 @@ contract WitOracleRadonRegistryDefault
     // --- Implementation of 'IWitOracleRadonRegistry' -----------------------------------------------------------------------
 
     function bytecodeOf(bytes32 _radHash)
-        public view
-        override
+        public view override
+        radonRequestExists(_radHash)
         returns (bytes memory)
     {
         return __database().radsBytecode[_radHash];

diff --git a/migrations/scripts/3_core.js b/migrations/scripts/3_core.js
@@ -43,7 +43,7 @@ module.exports = async function (_, network, [, from]) {
     libs: specs.WitOracleRequestFactory.libs,
     immutables: specs.WitOracleRequestFactory.immutables,
     intrinsics: {
-      types: ["address", "address", "bool", "bytes32"],
+      types: ["address", "bool", "bytes32"],
       values: [
         /* _witOracle  */ await determineProxyAddr(from, specs.WitOracle?.vanity || 3),
         /* _upgradable */ true,

diff --git a/migrations/scripts/4_proxies.js b/migrations/scripts/4_proxies.js
@@ -18,8 +18,8 @@ module.exports = async function (_, network, [, from, reporter]) {
 
   const singletons = [
     "WitOracleRadonRegistry",
-    "WitOracleRequestFactory",
     "WitOracle",
+    "WitOracleRequestFactory",
     "WitPriceFeeds",
   ]
 

diff --git a/test/TestWitOracleRadonEncodingLib.sol b/test/TestWitOracleRadonEncodingLib.sol
@@ -88,7 +88,7 @@ contract TestWitOracleRadonEncodingLib {
     Witnet.RadonRetrieval memory source;
     source.method = Witnet.RadonRetrievalMethods.HttpGet;
     source.url = "https://data.messar.io/api/v1/assets/\\0\\/metrics/market-data?fields=market_data/price_\\1\\";
-    source.script = hex"861877821866646461746182186664706f6f6c8218646b746f6b656e3150726963658218571a000f4240185b";
+    source.radonScript = hex"861877821866646461746182186664706f6f6c8218646b746f6b656e3150726963658218571a000f4240185b";
     bytes memory bytecode = WitOracleRadonEncodingLib.encode(source);
     // emit Log(bytecode);
     Assert.equal(
@@ -106,7 +106,7 @@ contract TestWitOracleRadonEncodingLib {
     source.headers = new string[2][](2);
     source.headers[0] = [ "user-agent", "witnet-rust" ];
     source.headers[1] = [ "content-type", "text/html; charset=utf-8" ];
-    source.script = hex"861877821866646461746182186664706f6f6c8218646b746f6b656e3150726963658218571a000f4240185b";
+    source.radonScript = hex"861877821866646461746182186664706f6f6c8218646b746f6b656e3150726963658218571a000f4240185b";
     bytes memory bytecode = WitOracleRadonEncodingLib.encode(source);
     // emit Log(bytecode);
     Assert.equal(

diff --git a/test/TestWitnetV2.sol → test/TestWitnet.sol b/test/TestWitnetV2.sol → test/TestWitnet.sol
diff --git a/test/mocks/WitMockedRandomness.sol b/test/mocks/WitMockedRandomness.sol
@@ -1,4 +1,4 @@
-º// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: MIT
 
 pragma solidity >=0.7.0 <0.9.0;
 pragma experimental ABIEncoderV2;