Merge pull request ethereumjs#443 from ethereumjs/refactor/state-module

holgerd77 · web-flow · commit c842d101108d · 2019-02-21T17:22:09.000+01:00
Move stateManager, storageReader and cache to state module
diff --git a/lib/index.js b/lib/index.js
@@ -1,7 +1,7 @@
 const Buffer = require('safe-buffer').Buffer
 const util = require('util')
 const ethUtil = require('ethereumjs-util')
-const StateManager = require('./stateManager.js')
+const { StateManager } = require('./state')
 const Common = require('ethereumjs-common').default
 const Account = require('ethereumjs-account')
 const AsyncEventEmitter = require('async-eventemitter')
diff --git a/lib/runCall.js b/lib/runCall.js
@@ -3,7 +3,7 @@ const async = require('async')
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
 const exceptions = require('./exceptions.js')
-const StorageReader = require('./storageReader')
+const { StorageReader } = require('./state')
 
 const ERROR = exceptions.ERROR
 
diff --git a/lib/runCode.js b/lib/runCode.js
@@ -19,7 +19,7 @@ const lookupOpInfo = require('./vm/opcodes.js')
 const opFns = require('./vm/opFns.js')
 const Memory = require('./vm/memory')
 const exceptions = require('./exceptions.js')
-const StorageReader = require('./storageReader')
+const { StorageReader } = require('./state')
 const setImmediate = require('timers').setImmediate
 const BN = utils.BN
 
diff --git a/lib/runTx.js b/lib/runTx.js
@@ -5,7 +5,7 @@ const BN = utils.BN
 const Bloom = require('./bloom')
 const Block = require('ethereumjs-block')
 const Account = require('ethereumjs-account')
-const StorageReader = require('./storageReader')
+const { StorageReader } = require('./state')
 
 /**
  * Process a transaction. Run the vm. Transfers eth. Checks balances.
diff --git a/lib/state/cache.js b/lib/state/cache.js
diff --git a/lib/state/index.js b/lib/state/index.js
@@ -0,0 +1,7 @@
+const StateManager = require('./stateManager')
+const StorageReader = require('./storageReader')
+
+module.exports = {
+  StateManager,
+  StorageReader
+}
diff --git a/lib/state/stateManager.js b/lib/state/stateManager.js
diff --git a/lib/state/storageReader.js b/lib/state/storageReader.js
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   ],
   "scripts": {
     "coverage": "nyc npm run coverageTests && nyc report --reporter=text-lcov > .nyc_output/lcov.info",
-    "coverageTests": "tape ./tests/api/*.js ./tests/tester.js -s",
+    "coverageTests": "tape './tests/api/**/*.js' ./tests/tester.js -s",
     "coveralls": "npm run coverage && if [ -n \"$COVERALLS_REPO_TOKEN\" ]; then coveralls <.nyc_output/lcov.info; fi",
     "testVM": "node ./tests/tester -v",
     "testStateByzantium": "npm run build:dist && node ./tests/tester -s --fork='Byzantium' --dist",
diff --git a/tests/api/runBlock.js b/tests/api/runBlock.js
@@ -5,7 +5,7 @@ const Transaction = require('ethereumjs-tx')
 const Common = require('ethereumjs-common').default
 const util = require('ethereumjs-util')
 const runBlock = require('../../lib/runBlock')
-const StateManager = require('../../lib/stateManager')
+const { StateManager } = require('../../lib/state')
 const runTx = require('../../lib/runTx')
 const testData = require('./testdata.json')
 const { createGenesis, createAccount, setupVM } = require('./utils')
diff --git a/tests/api/runBlockchain.js b/tests/api/runBlockchain.js
@@ -5,7 +5,7 @@ const Blockchain = require('ethereumjs-blockchain')
 const Block = require('ethereumjs-block')
 const util = require('ethereumjs-util')
 const runBlockchain = require('../../lib/runBlockchain')
-const StateManager = require('../../lib/stateManager')
+const { StateManager } = require('../../lib/state')
 const { createGenesis } = require('./utils')
 
 tape('runBlockchain', (t) => {
diff --git a/tests/api/runTx.js b/tests/api/runTx.js
@@ -2,7 +2,7 @@ const { promisify } = require('util')
 const tape = require('tape')
 const Transaction = require('ethereumjs-tx')
 const runTx = require('../../lib/runTx')
-const StateManager = require('../../lib/stateManager')
+const { StateManager } = require('../../lib/state')
 const VM = require('../../lib/index')
 const { createAccount } = require('./utils')
 
diff --git a/tests/api/state/cache.js b/tests/api/state/cache.js
@@ -2,8 +2,8 @@ const { promisify } = require('util')
 const tape = require('tape')
 const Trie = require('merkle-patricia-tree/secure.js')
 const Account = require('ethereumjs-account')
-const Cache = require('../../lib/cache')
-const utils = require('./utils')
+const Cache = require('../../../lib/state/cache')
+const utils = require('../utils')
 
 tape('cache initialization', (t) => {
   t.test('should initialize', async (st) => {
diff --git a/tests/api/state/stateManager.js b/tests/api/state/stateManager.js
@@ -1,8 +1,8 @@
 const { promisify } = require('util')
 const tape = require('tape')
 const util = require('ethereumjs-util')
-const StateManager = require('../../lib/stateManager')
-const { createAccount } = require('./utils')
+const StateManager = require('../../../lib/state/stateManager')
+const { createAccount } = require('../utils')
 
 tape('StateManager', (t) => {
   t.test('should instantiate', (st) => {
diff --git a/tests/api/state/storageReader.js b/tests/api/state/storageReader.js
@@ -1,6 +1,6 @@
 const { promisify } = require('util')
 const tape = require('tape')
-const StorageReader = require('../../lib/storageReader')
+const { StorageReader } = require('../../../lib/state')
 
 const mkStateManagerMock = () => {
   let i = 0
