Eliminate deadlock by using generate instead of setgenerate RPC

comm.go

@@ -126,7 +126,7 @@ func (com *Communication) Start(actors []*Actor, node *Node, txCurve map[int32]*
 		}
 	}
 
-	// Start mining.
+	// Start a miner process.
 	miner, err := NewMiner(miningAddrs, com.exit, com.height, com.txpool)
 	if err != nil {
 		close(com.exit)
@@ -428,6 +428,12 @@ func (com *Communication) estimateTpb(tpbChan chan<- int) {
 func (com *Communication) Communicate(txCurve map[int32]*Row, miner *Miner, actors []*Actor) {
 	defer com.wg.Done()
 
+	go func() {
+		if err := miner.Generate(uint32(*startBlock) - 1); err != nil {
+			close(com.exit)
+		}
+	}()
+
 	for {
 		select {
 		case h := <-com.height:
@@ -438,12 +444,6 @@ func (com *Communication) Communicate(txCurve map[int32]*Row, miner *Miner, acto
 				return
 			}
 
-			// disable mining until the required no. of tx are in mempool
-			if err := miner.StopMining(); err != nil {
-				close(com.exit)
-				return
-			}
-
 			// wait until this block is processed
 			select {
 			case <-com.blockQueue.processed:
@@ -575,10 +575,11 @@ func (com *Communication) Communicate(txCurve map[int32]*Row, miner *Miner, acto
 			log.Printf("Waiting for miner...")
 			wg.Wait()
 			// mine the above tx in the next block
-			if err := miner.StartMining(); err != nil {
-				close(com.exit)
-				return
-			}
+			go func() {
+				if err := miner.Generate(1); err != nil {
+					close(com.exit)
+				}
+			}()
 		case <-com.exit:
 			return
 		}

miner.go

@@ -107,11 +107,6 @@ func NewMiner(miningAddrs []btcutil.Address, exit chan struct{},
 		return miner, err
 	}
 
-	// Use just one core for mining.
-	if err := miner.StartMining(); err != nil {
-		return miner, err
-	}
-
 	// Register for block notifications.
 	if err := miner.client.NotifyBlocks(); err != nil {
 		log.Printf("%s: Cannot register for block notifications: %v", miner, err)
@@ -139,3 +134,12 @@ func (m *Miner) StopMining() error {
 	}
 	return nil
 }
+
+// Generate makes the CPU miner mine the requested number of blocks
+func (m *Miner) Generate(numBlocks uint32) error {
+	if _, err := m.client.Generate(numBlocks); err != nil {
+		log.Printf("%s: Cannot generate %d blocks: %v", m, numBlocks, err)
+		return err
+	}
+	return nil
+}