removed redundant code in examples

web3 · Jul 7, 2015 · f1f30d0 · f1f30d0
1 parent 84a3d93
commit f1f30d0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/example/contract.html b/example/contract.html
@@ -34,26 +34,16 @@
         var watch = web3.eth.filter('latest');
 
         // create contract
+        document.getElementById('status').innerText = "transaction sent, waiting for confirmation";
         web3.eth.contract(abi).new({data: code}, function (err, contract) {
             if (err) {
                 console.error('contract creation failed!');
                 return;
             }
             myContract = contract;
             console.log('address: ' + myContract.address);
-            document.getElementById('status').innerText = "transaction sent, waiting for confirmation";
-            watch.watch(function (err, hash) {
-                var block = web3.eth.getBlock(hash, true); 
-                var contractMined = block.transactions.reduce(function (mined, th) {
-                    // TODO: compiled code do not have 0x prefix
-                    return mined || (th.from === web3.eth.defaultAccount && th.input.indexOf(code) !== -1);
-                }, false);
-
-                if (contractMined) {
-                    document.getElementById('status').innerText = 'Mined!';
-                    document.getElementById('call').style.visibility = 'visible';
-                }
-            });
+            document.getElementById('status').innerText = 'Mined!';
+            document.getElementById('call').style.visibility = 'visible';
         });
     }
 

diff --git a/example/contract_array.html b/example/contract_array.html
@@ -34,26 +34,17 @@
         var watch = web3.eth.filter('latest');
 
         // create contract
+        document.getElementById('status').innerText = "transaction sent, waiting for confirmation";
         web3.eth.contract(abi).new({data: code}, function (err, contract) {
             if (err) {
                 console.error('contract creation failed!');
                 return;
             }
             myContract = contract;
             console.log('address: ' + myContract.address);
-            document.getElementById('status').innerText = "transaction sent, waiting for confirmation";
-            watch.watch(function (err, hash) {
-                var block = web3.eth.getBlock(hash, true); 
-                var contractMined = block.transactions.reduce(function (mined, th) {
-                    // TODO: compiled code do not have 0x prefix
-                    return mined || (th.from === web3.eth.defaultAccount && th.input.indexOf(code) !== -1);
-                }, false);
 
-                if (contractMined) {
-                    document.getElementById('status').innerText = 'Mined!';
-                    document.getElementById('call').style.visibility = 'visible';
-                }
-            });
+            document.getElementById('status').innerText = 'Mined!';
+            document.getElementById('call').style.visibility = 'visible';
         });
     }
 

diff --git a/example/event_inc.html b/example/event_inc.html
@@ -47,7 +47,6 @@
                 }
 
                 contract = c;
-
                 console.log('address: ' + contract.address);
                 document.getElementById('status').innerText = 'Mined!';
                 document.getElementById('call').style.visibility = 'visible';