feat: update ethereum resolvers

ipld · Jul 11, 2017 · f258c9e · f258c9e
1 parent 21ceb16
commit f258c9e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -52,11 +52,7 @@
     "ipfs-repo": "~0.15.0",
     "ipld-dag-cbor": "~0.11.1",
     "ipld-dag-pb": "~0.11.0",
-    "ipld-eth-block": "^2.2.2",
-    "ipld-eth-block-list": "^1.0.4",
-    "ipld-eth-state-trie": "^1.0.4",
-    "ipld-eth-storage-trie": "^1.0.1",
-    "ipld-eth-tx-trie": "^1.0.1",
+    "ipld-eth-star": "^1.4.1",
     "is-ipfs": "~0.3.0",
     "lodash.flatten": "^4.4.0",
     "lodash.includes": "^4.3.0",
@@ -76,4 +72,4 @@
     "kumavis <kumavis@users.noreply.github.com>",
     "wanderer <mjbecze@gmail.com>"
   ]
-}
+}
diff --git a/src/index.js b/src/index.js
@@ -16,11 +16,13 @@ const MemoryStore = require('interface-datastore').MemoryDatastore
 
 const dagPB = require('ipld-dag-pb')
 const dagCBOR = require('ipld-dag-cbor')
-const ipldEthBlock = require('ipld-eth-block')
-const ipldEthBlockList = require('ipld-eth-block-list')
-const ipldEthTxTrie = require('ipld-eth-tx-trie')
-const ipldEthStateTrie = require('ipld-eth-state-trie')
-const ipldEthStorageTrie = require('ipld-eth-storage-trie')
+const ipldEthAccountSnapshot = require('ipld-eth-star').ethAccountSnapshot
+const ipldEthBlock = require('ipld-eth-star').ethBlock
+const ipldEthBlockList = require('ipld-eth-star').ethBlockList
+const ipldEthStateTrie = require('ipld-eth-star').ethStateTrie
+const ipldEthStorageTrie = require('ipld-eth-star').ethStorageTrie
+const ipldEthTx = require('ipld-eth-star').ethTx
+const ipldEthTxTrie = require('ipld-eth-star').ethTxTrie
 
 function noop () {}
 
@@ -62,6 +64,10 @@ class IPLDResolver {
                      dagCBOR.resolver,
                      dagCBOR.util)
 
+    this.support.add(ipldEthAccountSnapshot.resolver.multicodec,
+                     ipldEthAccountSnapshot.resolver,
+                     ipldEthAccountSnapshot.util)
+
     this.support.add(ipldEthBlock.resolver.multicodec,
                      ipldEthBlock.resolver,
                      ipldEthBlock.util)
@@ -70,17 +76,21 @@ class IPLDResolver {
                      ipldEthBlockList.resolver,
                      ipldEthBlockList.util)
 
-    this.support.add(ipldEthTxTrie.resolver.multicodec,
-                     ipldEthTxTrie.resolver,
-                     ipldEthTxTrie.util)
-
     this.support.add(ipldEthStateTrie.resolver.multicodec,
                      ipldEthStateTrie.resolver,
                      ipldEthStateTrie.util)
 
     this.support.add(ipldEthStorageTrie.resolver.multicodec,
                      ipldEthStorageTrie.resolver,
                      ipldEthStorageTrie.util)
+
+    this.support.add(ipldEthTx.resolver.multicodec,
+                     ipldEthTx.resolver,
+                     ipldEthTx.util)
+
+    this.support.add(ipldEthTxTrie.resolver.multicodec,
+                     ipldEthTxTrie.resolver,
+                     ipldEthTxTrie.util)
   }
 
   get (cid, path, options, callback) {

diff --git a/test/ipld-eth-block.js b/test/ipld-eth-block.js
@@ -6,7 +6,7 @@ const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
 const BlockService = require('ipfs-block-service')
-const ipldEthBlock = require('ipld-eth-block')
+const ipldEthBlock = require('ipld-eth-star').ethBlock
 const EthBlockHeader = require('ethereumjs-block/header')
 const series = require('async/series')
 const each = require('async/each')

diff --git a/test/ipld-eth-star.js b/test/ipld-eth-star.js
@@ -95,7 +95,7 @@ module.exports = (repo) => {
       })
 
       it('block-to-account resolve', (done) => {
-        resolver.get(ethObjs.child.cid, '/parent/state/0/0/0/0/1/7/nonce', (err, result) => {
+        resolver.get(ethObjs.child.cid, '/parent/state/0/0/0/0/1/7/2/7/8/a/1/e/6/e/9/6/3/5/e/1/a/3/f/1/1/e/b/0/2/2/d/a/1/f/5/7/e/a/0/0/4/d/8/5/2/d/9/d/1/9/4/2/d/4/3/6/0/8/5/4/0/4/7/1/nonce', (err, result) => {
           expect(err).to.not.exist()
           expect(result.value.toString('hex'), '03')
           expect(result.remainderPath).to.equal('')