From 4eee4dfc657f2326be430199df898bd5ec2b1d6b Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 22 Feb 2019 14:10:53 -0500 Subject: [PATCH] chore(templates): replace blockchain.connect by onReady --- packages/embark/templates/boilerplate/app/js/index.js | 3 +-- packages/embark/templates/demo/app/dapp.js | 3 +-- test_dapps/test_app/app/js/index.js | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/embark/templates/boilerplate/app/js/index.js b/packages/embark/templates/boilerplate/app/js/index.js index 53e1072e2..fc58b25d8 100644 --- a/packages/embark/templates/boilerplate/app/js/index.js +++ b/packages/embark/templates/boilerplate/app/js/index.js @@ -1,11 +1,10 @@ import EmbarkJS from 'Embark/EmbarkJS'; -import config from '../../embarkArtifacts/config/blockchain.json'; // import your contracts // e.g if you have a contract named SimpleStorage: //import SimpleStorage from 'Embark/contracts/SimpleStorage'; -EmbarkJS.Blockchain.connect(config, (err) => { +EmbarkJS.onReady((err) => { // You can execute contract calls after the connection }); diff --git a/packages/embark/templates/demo/app/dapp.js b/packages/embark/templates/demo/app/dapp.js index 14a6c85dd..999e40550 100644 --- a/packages/embark/templates/demo/app/dapp.js +++ b/packages/embark/templates/demo/app/dapp.js @@ -7,7 +7,6 @@ import Blockchain from './components/blockchain'; import Whisper from './components/whisper'; import Storage from './components/storage'; import ENS from './components/ens'; -import config from '../embarkArtifacts/config/blockchain'; import './dapp.css'; @@ -28,7 +27,7 @@ class App extends React.Component { } componentDidMount() { - EmbarkJS.Blockchain.connect(config, (err) => { + EmbarkJS.onReady((err) => { this.setState({blockchainEnabled: true}); if (err) { // If err is not null then it means something went wrong connecting to ethereum diff --git a/test_dapps/test_app/app/js/index.js b/test_dapps/test_app/app/js/index.js index 3f06172a2..94e3388fa 100644 --- a/test_dapps/test_app/app/js/index.js +++ b/test_dapps/test_app/app/js/index.js @@ -2,7 +2,6 @@ import React from 'react'; import EmbarkJS from 'Embark/EmbarkJS'; import {SimpleStorage, Test, SimpleStorageTest} from '../../embarkArtifacts/contracts'; -import config from '../../embarkArtifacts/config/blockchain'; window.SimpleStorageTest = SimpleStorageTest; @@ -34,7 +33,7 @@ var addToLog = function(id, txt) { // Blockchain example // =========================== $(document).ready(function() { - EmbarkJS.Blockchain.connect(config, (err) => { + EmbarkJS.onReady((err) => { if (err) { console.error(err); }