Rewrite continued:

[core.git] / contrib / chash / chash.php

diff --git a/contrib/chash/chash.php b/contrib/chash/chash.php
index c37216ab3bb3826443e2a9ae03496c2da1db9cef..1c4965cb835d56892179bff65dea904f3627a106 100644 (file)
--- a/contrib/chash/chash.php
+++ b/contrib/chash/chash.php
@@ -1,7 +1,7 @@
 <?php
 error_reporting(E_ALL | E_STRICT);
 
-define('START_TIME'            , microtime(TRUE));
+define('START_TIME'            , microtime(true));
 define('CHECK_POINT'           , 'chash.pos');
 
 // Hashes needed to complete a "block"
@@ -248,7 +248,7 @@ function flushCheckPointFile ($hash) {
        print ('FLUSHING: Writing ' . count($GLOBALS['found_hashes']) . ' blocks ...' . PHP_EOL);
 
        // Start timer
-       $timer = microtime(TRUE);
+       $timer = microtime(true);
 
        // Flush data
        file_put_contents(
@@ -262,11 +262,11 @@ function flushCheckPointFile ($hash) {
                base64_encode((float) $GLOBALS['nonce']) . ':' .
                $hash . ':' .
                $GLOBALS['root_hash'] . ':' .
-               base64_encode(gzcompress(serialize($GLOBALS['found_hashes'])))
+               base64_encode(gzcompress(json_encode($GLOBALS['found_hashes'])))
        );
 
        // Set time
-       $GLOBALS['time_flush'] = microtime(TRUE);
+       $GLOBALS['time_flush'] = microtime(true);
        print ('FLUSHING: Took ' . ($GLOBALS['time_flush'] - $timer) . ' seconds.' . PHP_EOL);
 }
 
@@ -295,7 +295,7 @@ function addFoundHash ($hash) {
        print ('FOUND: hash=' . $hash . ',nonce=' . $GLOBALS['nonce'] . ',total_found=' . $GLOBALS['total_found'] . PHP_EOL);
 
        // Set time as a new hash was found
-       $GLOBALS['found_time'] = microtime(TRUE);
+       $GLOBALS['found_time'] = microtime(true);
 
        // Flush check-point file after new hash is found
        flushCheckPointFile($hash);
@@ -375,9 +375,9 @@ $GLOBALS['genesis_hash'] = $GLOBALS['modula_hash'];
 $GLOBALS['root_hash']    = $GLOBALS['modula_hash'];
 
 // Output results
-print ('hashes=' . print_r($gensisHashes, TRUE));
-print ('modulaHashes=' . print_r($modulaHashes, TRUE));
-print ('sqrtHashes=' . print_r($sqrtHashes, TRUE));
+print ('hashes=' . print_r($gensisHashes, true));
+print ('modulaHashes=' . print_r($modulaHashes, true));
+print ('sqrtHashes=' . print_r($sqrtHashes, true));
 print ('modulaHash=' . $GLOBALS['modula_hash'] . PHP_EOL);
 
 // Total reward + hashes
@@ -385,7 +385,7 @@ $GLOBALS['total_reward']   = 0;
 $GLOBALS['total_hashes']   = 0;
 $GLOBALS['total_found']    = 0;
 $GLOBALS['total_blocks']   = 0;
-$GLOBALS['found_time']     = microtime(TRUE);
+$GLOBALS['found_time']     = microtime(true);
 
 // Is the check point there?
 if (is_readable(CHECK_POINT)) {
@@ -407,7 +407,7 @@ if (is_readable(CHECK_POINT)) {
        $GLOBALS['hash_cycles']    = intval($data[5]);
        $GLOBALS['nonce']          = (float) base64_decode($data[6]);
        $GLOBALS['root_hash']      = $data[8];
-       $GLOBALS['found_hashes']   = unserialize(gzuncompress(base64_decode($data[9])));
+       $GLOBALS['found_hashes']   = json_decode(gzuncompress(base64_decode($data[9])));
 
        // Set modula hash
        setModulaHash($data[7]);
@@ -422,13 +422,13 @@ print ('nonce=' . $GLOBALS['nonce'] . PHP_EOL);
 print ('found=' . count($GLOBALS['found_hashes'][$GLOBALS['total_blocks']]) . PHP_EOL);
 
 // Start "mining"
-while (TRUE) {
+while (true) {
        // Init hash-per-block counter and hashrate
        $GLOBALS['hashes_block'] = 0;
        $hashrate = 0;
 
        // Wait for block_size iterations (= found hashes). This is one block
-       $timeBlock   = microtime(TRUE);
+       $timeBlock   = microtime(true);
        $timeDisplay = $timeBlock;
        $GLOBALS['time_flush'] = $timeBlock;
 
@@ -447,7 +447,7 @@ while (TRUE) {
                $GLOBALS['iteration_second'] = 0;
 
                // Now start the "mining" ...
-               $timeHash = microtime(TRUE);
+               $timeHash = microtime(true);
                while ($sumNonce < $GLOBALS['sum_modula']) {
                        // Calculate new nonce
                        calculateNonce();
@@ -459,7 +459,7 @@ while (TRUE) {
                        $sumNonce  = calculateSumFromHash($nonceHash);
 
                        // Time spend in loop
-                       $testTime = abs(microtime(TRUE) - $timeDisplay);
+                       $testTime = abs(microtime(true) - $timeDisplay);
 
                        // Calculate hashrate/sec
                        $hashrate = 1 / $testTime * $GLOBALS['iteration_second'] * $GLOBALS['hash_cycles'];
@@ -470,12 +470,12 @@ while (TRUE) {
                                print ('hashrate=' . round($hashrate) . ' hashes/sec,iterSecond=' . $GLOBALS['iteration_second'] . ' iterations/sec' . PHP_EOL);
 
                                // Reset timer
-                               $timeDisplay = microtime(TRUE);
+                               $timeDisplay = microtime(true);
                                $GLOBALS['iteration_second']  = 0;
                        } // END - if
 
                        // Time spend from last flush
-                       $testTime = abs(microtime(TRUE) - $GLOBALS['time_flush']);
+                       $testTime = abs(microtime(true) - $GLOBALS['time_flush']);
 
                        // Only once per 10 seconds
                        if ($testTime >= $GLOBALS['flush_file_time']) {
@@ -484,7 +484,7 @@ while (TRUE) {
                        } // END - if
 
                        // Time spend from last found block
-                       $testTime = abs(microtime(TRUE) - $GLOBALS['found_time']);
+                       $testTime = abs(microtime(true) - $GLOBALS['found_time']);
 
                        // Is the last found time to far away?
                        if ($testTime >= $GLOBALS['restart_search_time']) {
@@ -501,7 +501,7 @@ while (TRUE) {
                                        foreach ($block as $hash) {
                                                if (!isset($hash['root_hash'])) {
                                                        // Bad file
-                                                       die('INCONSISTENCY: hash=' . print_r($hash, TRUE));
+                                                       die('INCONSISTENCY: hash=' . print_r($hash, true));
                                                } // END - if
 
                                                if (isset($rootHashes[$hash['root_hash']])) {
@@ -544,7 +544,7 @@ while (TRUE) {
                                                        print ('idx=' . $idx . ',modulaHash=' . $GLOBALS['root_hash'] . ' - Is now new root hash!' . PHP_EOL);
 
                                                        // Reset "found time" (when a hash was found)
-                                                       $GLOBALS['found_time'] = microtime(TRUE);
+                                                       $GLOBALS['found_time'] = microtime(true);
 
                                                        // Re-initialize nonce
                                                        initNonce();
@@ -568,7 +568,7 @@ while (TRUE) {
                // If the iteration is zero, then no hash is found
                if ($GLOBALS['iteration'] == 0) {
                        // Bad hash found
-                       $timeBadHashes += abs(microtime(TRUE) - $timeHash);
+                       $timeBadHashes += abs(microtime(true) - $timeHash);
 
                        // And next round
                        print('BAD:nonce=' . $GLOBALS['nonce'] . PHP_EOL);
@@ -586,7 +586,7 @@ while (TRUE) {
        } // END - while
 
        // Time taken for one
-       $timeBlock = abs(microtime(TRUE) - $timeBlock);
+       $timeBlock = abs(microtime(true) - $timeBlock);
 
        // Calculate reward
        $reward = abs($timeBlock - $timeBadHashes) / $hashrate * $GLOBALS['hashes_block'] / $GLOBALS['block_size'] * 1000;
@@ -610,10 +610,7 @@ while (TRUE) {
        $blockValue = $GLOBALS['total_reward'] / $GLOBALS['total_blocks'] * $GLOBALS['total_hashes'] / ($GLOBALS['block_size'] * $GLOBALS['total_blocks']);
 
        // Calculate reward per hour (= 3600 seconds)
-       $rewardPerHour = $GLOBALS['total_reward'] / abs(microtime(TRUE) - START_TIME) * 3600;
+       $rewardPerHour = $GLOBALS['total_reward'] / abs(microtime(true) - START_TIME) * 3600;
 
        print ('totalReward=' . $GLOBALS['total_reward'] . ',blockValue=' . $blockValue . ',rewardPerHour=' . $rewardPerHour . PHP_EOL);
 } // END - while
-
-// [EOF]
-?>