Fix rebase conflict

bandprotocol · Oct 1, 2020 · 9f03da1 · 9f03da1
1 parent 67175ba
commit 9f03da1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/bridges/evm/contracts/stdref/IStdReference.sol b/bridges/evm/contracts/stdref/IStdReference.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.6.11;
 pragma experimental ABIEncoderV2;
 
-abstract contract IStdReference {
+interface IStdReference {
     /// A structure returned whenever someone requests for standard reference data.
     struct ReferenceData {
         uint256 rate; // base/quote exchange rate, multiplied by 1e18.
@@ -17,25 +17,24 @@ abstract contract IStdReference {
         returns (ReferenceData memory);
 
     /// Similar to getReferenceData, but with multiple base/quote pairs at once.
-    function getReferenceDataBulk(string[] memory _bases, string[] memory _quotes)
-        external
-        view
-        returns (ReferenceData[] memory);
+    function getReferenceDataBulk(
+        string[] memory _bases,
+        string[] memory _quotes
+    ) external view returns (ReferenceData[] memory);
 }
 
 abstract contract StdReferenceBase is IStdReference {
     function getReferenceData(string memory _base, string memory _quote)
         public
         virtual
+        override
         view
         returns (ReferenceData memory);
 
-    /// Similar to getReferenceData, but with multiple base/quote pairs at once.
-    function getReferenceDataBulk(string[] memory _bases, string[] memory _quotes)
-        public
-        view
-        returns (ReferenceData[] memory)
-    {
+    function getReferenceDataBulk(
+        string[] memory _bases,
+        string[] memory _quotes
+    ) public override view returns (ReferenceData[] memory) {
         require(_bases.length == _quotes.length, "BAD_INPUT_LENGTH");
         uint256 len = _bases.length;
         ReferenceData[] memory results = new ReferenceData[](len);

diff --git a/bridges/evm/contracts/stdref/StdReference.sol b/bridges/evm/contracts/stdref/StdReference.sol
@@ -3,11 +3,11 @@ pragma solidity 0.6.11;
 pragma experimental ABIEncoderV2;
 
 import {Ownable} from "openzeppelin-solidity/contracts/access/Ownable.sol";
-import {IStdReference} from "./IStdReference.sol";
+import {StdReferenceBase} from "./IStdReference.sol";
 import {IBridge} from "../interfaces/IBridge.sol";
 import {Obi} from "../obi/Obi.sol";
 
-contract StdReference is Ownable, IStdReference {
+contract StdReference is Ownable, StdReferenceBase {
     using Obi for Obi.Data;
 
     struct RefData {

diff --git a/bridges/evm/contracts/stdref/StdReferenceProxy.sol b/bridges/evm/contracts/stdref/StdReferenceProxy.sol
@@ -3,9 +3,9 @@ pragma solidity 0.6.11;
 pragma experimental ABIEncoderV2;
 
 import {Ownable} from "openzeppelin-solidity/contracts/access/Ownable.sol";
-import {IStdReference} from "./IStdReference.sol";
+import {IStdReference, StdReferenceBase} from "./IStdReference.sol";
 
-contract StdReferenceProxy is Ownable, IStdReference {
+contract StdReferenceProxy is Ownable, StdReferenceBase {
     IStdReference public ref;
 
     constructor(IStdReference _ref) public {