OSDN Git Service

update echo
authorHAOYUatHZ <haoyu@protonmail.com>
Tue, 10 Apr 2018 23:22:59 +0000 (07:22 +0800)
committerhaoyuAThz <haoyu@protonmail.com>
Sat, 14 Apr 2018 23:39:26 +0000 (07:39 +0800)
cmd/miner/main.go

index 7dc0660..f33911b 100644 (file)
@@ -2,8 +2,8 @@ package main
 
 import (
        "encoding/json"
-       "fmt"
-       "os"
+       "log"
+       // "os"
 
        "github.com/bytom/api"
        "github.com/bytom/consensus/difficulty"
@@ -22,7 +22,7 @@ func doWork(bh *types.BlockHeader, seed *bc.Hash) bool {
                bh.Nonce = i
                headerHash := bh.Hash()
                if difficulty.CheckProofOfWork(&headerHash, seed, bh.Bits) {
-                       fmt.Printf("Mining: successful-----proof hash:%v\n", headerHash.String())
+                       log.Printf("Mining succeed! Proof hash: %v\n", headerHash.String())
                        return true
                }
        }
@@ -42,31 +42,28 @@ func getBlockHeaderByHeight(height uint64) {
        data, _ := util.ClientCall("/get-block-header-by-height", Req{BlockHeight: height})
        rawData, err := json.Marshal(data)
        if err != nil {
-               fmt.Println(err)
-               os.Exit(1)
+               log.Fatalln(err)
        }
 
        resp := &Resp{}
        if err = json.Unmarshal(rawData, resp); err != nil {
-               fmt.Println(err)
-               os.Exit(1)
+               log.Fatalln(err)
        }
-       fmt.Println(resp.Reward)
+       log.Println("Reward:", resp.Reward)
 }
 
 func main() {
        data, _ := util.ClientCall("/get-work", nil)
        rawData, err := json.Marshal(data)
        if err != nil {
-               fmt.Println(err)
-               os.Exit(1)
+               log.Fatalln(err)
        }
        resp := &api.GetWorkResp{}
        if err = json.Unmarshal(rawData, resp); err != nil {
-               fmt.Println(err)
-               os.Exit(1)
+               log.Fatalln(err)
        }
 
+       log.Println("Mining at height:", resp.BlockHeader.Height)
        if doWork(resp.BlockHeader, resp.Seed) {
                util.ClientCall("/submit-work", &api.SubmitWorkReq{BlockHeader: resp.BlockHeader})
        }