From 3314aad9cc304eaa898fd667f68594301c105dbb Mon Sep 17 00:00:00 2001
From: Dan Finlay <somniac@me.com>
Date: Thu, 31 Mar 2016 16:32:06 -0700
Subject: Revert "Etherscan provider"

---
 app/scripts/lib/config-manager.js | 31 ++++++-------------
 app/scripts/lib/zero.js           | 65 ---------------------------------------
 2 files changed, 9 insertions(+), 87 deletions(-)
 delete mode 100644 app/scripts/lib/zero.js

(limited to 'app/scripts/lib')

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 121ede838..682b34637 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -47,6 +47,15 @@ ConfigManager.prototype.setConfig = function(config) {
   this.setData(data)
 }
 
+ConfigManager.prototype.setRpcTarget = function(rpcUrl) {
+  var config = this.getConfig()
+  config.provider = {
+    type: 'rpc',
+    rpcTarget: rpcUrl,
+  }
+  this.setConfig(config)
+}
+
 ConfigManager.prototype.getConfig = function() {
   var data = this.migrator.getData()
   if ('config' in data) {
@@ -61,28 +70,6 @@ ConfigManager.prototype.getConfig = function() {
   }
 }
 
-ConfigManager.prototype.setRpcTarget = function(rpcUrl) {
-  var config = this.getConfig()
-  config.provider = {
-    type: 'rpc',
-    rpcTarget: rpcUrl,
-  }
-  this.setConfig(config)
-}
-
-ConfigManager.prototype.useEtherscanProvider = function() {
-  var config = this.getConfig()
-  config.provider = {
-    type: 'etherscan',
-  }
-  this.setConfig(config)
-}
-
-ConfigManager.prototype.getProvider = function() {
-  var config = this.getConfig()
-  return config.provider
-}
-
 ConfigManager.prototype.setData = function(data) {
   this.migrator.saveData(data)
 }
diff --git a/app/scripts/lib/zero.js b/app/scripts/lib/zero.js
deleted file mode 100644
index d33f099d3..000000000
--- a/app/scripts/lib/zero.js
+++ /dev/null
@@ -1,65 +0,0 @@
-const ProviderEngine = require('web3-provider-engine/index.js')
-const DefaultFixture = require('web3-provider-engine/subproviders/default-fixture.js')
-const NonceTrackerSubprovider = require('web3-provider-engine/subproviders/nonce-tracker.js')
-const CacheSubprovider = require('web3-provider-engine/subproviders/cache.js')
-const FilterSubprovider = require('web3-provider-engine/subproviders/filters.js')
-const HookedWalletSubprovider = require('web3-provider-engine/subproviders/hooked-wallet.js')
-const RpcSubprovider = require('web3-provider-engine/subproviders/rpc.js')
-const EtherscanSubprovider = require('web3-provider-engine/subproviders/etherscan.js')
-
-
-module.exports = ZeroClientProvider
-
-
-function ZeroClientProvider(opts){
-  opts = opts || {}
-
-  var engine = new ProviderEngine()
-
-  // static
-  var staticSubprovider = new DefaultFixture()
-  engine.addProvider(staticSubprovider)
-
-  // nonce tracker
-  engine.addProvider(new NonceTrackerSubprovider())
-
-  // cache layer
-  var cacheSubprovider = new CacheSubprovider()
-  engine.addProvider(cacheSubprovider)
-
-  // filters
-  var filterSubprovider = new FilterSubprovider()
-  engine.addProvider(filterSubprovider)
-
-  // id mgmt
-  var idmgmtSubprovider = new HookedWalletSubprovider({
-    getAccounts: opts.getAccounts,
-    approveTransaction: opts.approveTransaction,
-    signTransaction: opts.signTransaction,
-  })
-  engine.addProvider(idmgmtSubprovider)
-
-  // data source
-  var dataProvider
-  if (!opts.etherscan) {
-    dataProvider = new RpcSubprovider({
-      rpcUrl: opts.rpcUrl || 'https://testrpc.metamask.io/',
-    })
-  } else {
-    dataProvider = new EtherscanSubprovider()
-  }
-  engine.addProvider(dataProvider)
-
-  // // log new blocks
-  // engine.on('block', function(block){
-  //   console.log('================================')
-  //   console.log('BLOCK CHANGED:', '#'+block.number.toString('hex'), '0x'+block.hash.toString('hex'))
-  //   console.log('================================')
-  // })
-
-  // start polling
-  engine.start()
-
-  return engine
-
-}
-- 
cgit