Cleanup kredits service #58

Merged
fsmanuel merged 5 commits from cleanup/kredits-service into master 2018-04-21 10:09:36 +00:00
2 changed files with 12 additions and 8 deletions
Showing only changes of commit acd1ce28f4 - Show all commits
+4 -1
View File
@@ -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) {
+8 -7
View File
@@ -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;
};