remove value(), just use get() instead [#23]

dapphub · Aug 7, 2016 · 645c77b · 645c77b
1 parent 48aa87e
commit 645c77b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contracts/feedbase.sol b/contracts/feedbase.sol
@@ -80,9 +80,6 @@ contract Feedbase is FeedbaseEvents {
         return feeds[id].price;
     }
 
-    function value(uint24 id) constant returns (bytes32 value) {
-        (value, ) = get(id);
-    }
     function timestamp(uint24 id) constant returns (uint40) {
         return feeds[id].timestamp;
     }

diff --git a/lib/feedbase.js b/lib/feedbase.js
@@ -16,10 +16,13 @@ module.exports = function(web3, env) {
 
       owner:        feedbase.owner(id),
       label:        toString(feedbase.label(id)),
-      value:        web3.toHex(feedbase.value(id)),
       price:        web3.toDecimal(feedbase.price(id)),
+
+      available:    feedbase.get.call(id)[1],
+      value:        feedbase.get.call(id)[0],
       timestamp:    web3.toDecimal(feedbase.timestamp(id)),
       expiration:   web3.toDecimal(feedbase.expiration(id)),
+
       unpaid:       feedbase.unpaid(id),
     }
   }