Merge pull request #30 from ngtuna/fix-import-cycle

fix import cycle

cmd/tomo/main.go

@@ -29,8 +29,8 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/clique"
 	"github.com/ethereum/go-ethereum/console"
+	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/internal/debug"
@@ -316,11 +316,9 @@ func startNode(ctx *cli.Context, stack *node.Node) {
 				started = true
 				log.Info("Enabled mining node!!!")
 			}
-			defer close(clique.Checkpoint)
+			defer close(core.Checkpoint)
 
-			for {
+			for range core.Checkpoint {
-				select {
-				case _ = <-clique.Checkpoint:
 				log.Info("Checkpoint!!! It's time to reconcile node's state...")
 				ok, err := ethereum.ValidateMiner()
 				if err != nil {
@@ -353,7 +351,6 @@ func startNode(ctx *cli.Context, stack *node.Node) {
 					log.Info("Enabled mining node!!!")
 				}
 			}
-			}
 		}()
 	}
 }

consensus/clique/clique.go

@@ -65,7 +65,6 @@ var (
 
 	diffInTurn = big.NewInt(2) // Block difficulty for in-turn signatures
 	diffNoTurn = big.NewInt(1) // Block difficulty for out-of-turn signatures
-	Checkpoint chan int
 )
 
 // Various error messages to mark blocks invalid. These should be private to
@@ -217,7 +216,6 @@ func New(config *params.CliqueConfig, db ethdb.Database) *Clique {
 	if conf.Epoch == 0 {
 		conf.Epoch = epochLength
 	}
-	Checkpoint = make(chan int)
 	// Allocate the snapshot caches and create the engine
 	recents, _ := lru.NewARC(inmemorySnapshots)
 	signatures, _ := lru.NewARC(inmemorySignatures)

core/blockchain.go

@@ -30,7 +30,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/mclock"
 	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/clique"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
@@ -48,7 +47,7 @@ import (
 
 var (
 	blockInsertTimer = metrics.NewRegisteredTimer("chain/inserts", nil)
-
+	Checkpoint       = make(chan int)
 	ErrNoGenesis     = errors.New("Genesis not found in chain")
 )
 
@@ -1187,8 +1186,8 @@ func (bc *BlockChain) insertChain(chain types.Blocks) (int, []interface{}, []*ty
 		stats.usedGas += usedGas
 		stats.report(chain, i, bc.stateCache.TrieDB().Size())
 		if i == len(chain)-1 {
-			if (chain[i].NumberU64() % bc.chainConfig.Clique.Epoch) == 0 {
+			if (bc.chainConfig.Clique != nil) && (chain[i].NumberU64()%bc.chainConfig.Clique.Epoch) == 0 {
-				clique.Checkpoint <- 1
+				Checkpoint <- 1
 			}
 		}
 	}

miner/worker.go

@@ -26,7 +26,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/clique"
 	"github.com/ethereum/go-ethereum/consensus/misc"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/state"
@@ -489,9 +488,8 @@ func (self *worker) commitNewWork() {
 		log.Info("Commit new mining work", "number", work.Block.Number(), "txs", work.tcount, "uncles", len(uncles), "elapsed", common.PrettyDuration(time.Since(tstart)))
 		self.unconfirmed.Shift(work.Block.NumberU64() - 1)
 	}
-	if (work.Block.NumberU64() % work.config.Clique.Epoch) == 0 {
+	if (work.config.Clique != nil) && (work.Block.NumberU64()%work.config.Clique.Epoch) == 0 {
-		log.Info("hey checkpoint")
+		core.Checkpoint <- 1
-		clique.Checkpoint <- 1
 	}
 	self.push(work)
 }