update tests; use web3-eth

package.json

@@ -32,6 +32,6 @@
   "dependencies": {
     "lokijs": "^1.5.6",
     "rxjs": "^6.5.2",
-    "web3": "^1.0.0-beta.37"
+    "web3-eth": "^1.2.1"
   }
 }

src/eventSyncer.js

@@ -4,13 +4,13 @@ const { randomString } = require('./utils.js');
 
 const Database = require('./database.js');
 const Events = require('events');
-const Web3 = require('web3');
+const Web3Eth = require('web3-eth');
 
 class EventSyncer {
 
   constructor(provider, dbFilename) {
     this.events = new Events();
-    this.web3 = new Web3(provider);
+    this.web3 = new Web3Eth(provider);
     this.dbFilename = dbFilename || 'phoenix.db';
   }
 

test/embark-test/app/app.js

@@ -10,8 +10,7 @@ import withObservables from '@nozbe/with-observables'
 const { scan, map } = require('rxjs/operators');
 import { of } from 'rxjs';
 
-
+const phoenix = new Phoenix(web3.currentProvider);
-const phoenix = new Phoenix(web3);
 
 const RankItem = ({items, onUpvote, onDownvote}) => {
   return items.map((item, i) => <div key={i} className="item">
@@ -33,13 +32,15 @@ class App extends React.Component {
   }
 
   componentDidMount(){
-    EmbarkJS.onReady((err) => {
+    //(async ()  => {
+      EmbarkJS.onReady(async (err) => {
         if(err){
           console.error(err);
           return;
         }
 
-      phoenix.init(() => {
+        await phoenix.init()
+
         observables.items = phoenix
           .trackEvent(Ranking, 'Rating', {filter: {}, fromBlock: 1})
           .pipe(
@@ -62,7 +63,7 @@ class App extends React.Component {
 
         this.setState({ready: true});
       });
-    });
+    //})();
   }
 
   upvote = address => () => {
@@ -80,11 +81,5 @@ class App extends React.Component {
   }
 }
 
-
-
-
 ReactDOM.render(<App />, document.getElementById('content'));
 
-
-
-

test/embark-test/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {},
   "dependencies": {
     "@nozbe/with-observables": "^1.0.5",
+    "embark": "^4.1.0",
     "phoenix": "../../",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",

test/observables/src/App.js

@@ -6,7 +6,6 @@ import withObservables from '@nozbe/with-observables'
 
 const web3 = new Web3("ws://localhost:8545");
 
-
 const Escrow = ({escrow}) => {
   console.log("Received new escrow property", escrow);
   return <ul><li>{escrow.buyer} {escrow.seller} - <b>EscrowID:{escrow.escrowId}</b></li></ul>;
@@ -17,7 +16,6 @@ const enhance = withObservables(['escrow'], ({ escrow }) => ({ escrow }));
 
 const EnhancedEscrow = enhance(Escrow)
 
-
 class App extends React.Component {
 
   state = {
@@ -39,18 +37,14 @@ class App extends React.Component {
       await this.EscrowContract.methods.createEscrow(1, accounts[1], accounts[0]).send({from: accounts[0]})
       await this.EscrowContract.methods.createEscrow(1, accounts[0], accounts[2]).send({from: accounts[0]})
 
-      const eventSyncer = new Phoenix(web3);
+      const eventSyncer = new Phoenix(web3.currentProvider);
 
-      eventSyncer.init(() => {
+      await eventSyncer.init();
       const replayObj = eventSyncer.trackEvent(this.EscrowContract, 'Created', {filter: {buyer: accounts[0]}, fromBlock: 1});
       this.setState({
         escrow: replayObj.asObservable()
       });
-      });
-
-
     })();
-
   }
 
   createTrx = async () => {