From acd1ce28f4e02568cba9b949abf25ab860a4e5d4 Mon Sep 17 00:00:00 2001
From: Manuel Wiedenmann <manuel@funkensturm.de>
Date: Sat, 21 Apr 2018 11:58:17 +0200
Subject: [PATCH] Use .init() instead of static .setup()

---
 app/services/kredits.js |  5 ++++-
 config/environment.js   | 15 ++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/services/kredits.js b/app/services/kredits.js
index b4158df..ca1e74a 100644
--- a/app/services/kredits.js
+++ b/app/services/kredits.js
@@ -60,7 +60,10 @@ export default Service.extend({
         ethSigner = ethProvider.getSigner();
       }
 
-      return Kredits.setup(ethProvider, ethSigner, config.ipfs).then((kredits) => {
+      let kredits = new Kredits(ethProvider, ethSigner);
+      return kredits
+        .init()
+        .then((kredits) => {
           this.set('kredits', kredits);
 
           if (this.currentUserAccounts && this.currentUserAccounts.length > 0) {
diff --git a/config/environment.js b/config/environment.js
index 7ac939e..1ecf71b 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -46,13 +46,6 @@ module.exports = function(environment) {
     }
   };
 
-  if (process.env.NETWORK_ID) {
-    ENV.contractMetadata['networkId'] = process.env.NETWORK_ID;
-  }
-  if (process.env.WEB3_PROVIDER_URL) {
-    ENV.web3ProviderUrl = process.env.WEB3_PROVIDER_URL;
-  }
-
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;
     // ENV.APP.LOG_ACTIVE_GENERATION = true;
@@ -60,6 +53,7 @@ module.exports = function(environment) {
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
     ENV.contractMetadata['networkId'] = '100';
+    ENV.web3ProviderUrl = 'http://localhost:7545';
 
     ENV.ipfs = {
       host: 'localhost',
@@ -84,5 +78,12 @@ module.exports = function(environment) {
     // here you can enable a production-specific feature
   }
 
+  if (process.env.NETWORK_ID) {
+    ENV.contractMetadata['networkId'] = process.env.NETWORK_ID;
+  }
+  if (process.env.WEB3_PROVIDER_URL) {
+    ENV.web3ProviderUrl = process.env.WEB3_PROVIDER_URL;
+  }
+
   return ENV;
 };