Merge branch 'development' of github.com:FactomProject/FactomCode into development

Author: PaulSnow

factoid/factoid.go

@@ -11,6 +11,9 @@ import (
 	"github.com/FactomProject/FactomCode/util"
 )
 
+var _ = util.Trace
+var _ = fmt.Sprintf
+
 // 1-byte version
 func FactoidTx_VersionCheck(version uint8) bool {
 	//	util.Trace(fmt.Sprintf("version being checked: %d", version))
@@ -19,18 +22,18 @@ func FactoidTx_VersionCheck(version uint8) bool {
 
 // in reality: 5 bytes
 func FactoidTx_LocktimeCheck(locktime int64) bool {
-	util.Trace(fmt.Sprintf("locktime being checked: 0x%X", locktime))
+	//util.Trace(fmt.Sprintf("locktime being checked: 0x%X", locktime))
 	return (0 == locktime)
 }
 
 // 1-byte RCD version
 func FactoidTx_RCDVersionCheck(version uint8) bool {
-	util.Trace()
+	//util.Trace()
 	return (0 == version)
 }
 
 // 1-byte RCD type
 func FactoidTx_RCDTypeCheck(rcdtype uint8) bool {
-	util.Trace()
+	//util.Trace()
 	return (0 == rcdtype)
 }

process/processor.go

@@ -25,10 +25,13 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"sort"
 	"strconv"
+	"time"
 )
 
 var _ = (*block.FBlock)(nil)
 
+var _ = util.Trace
+
 var (
 	db       database.Db        // database
 	dchain   *common.DChain     //Directory Block Chain
@@ -223,6 +226,14 @@ func serveCtlMsgRequest(msg wire.FtmInternalMsg) error {
 // Serve incoming msg from inMsgQueue
 func serveMsgRequest(msg wire.FtmInternalMsg) error {
 
+	if msg.Command() == wire.CmdFBlock {
+		fblock, ok := msg.(*wire.MsgFBlock)
+		if ok {
+			fmt.Printf("%s : Current chain height: %v\r", time.Now().Format(time.RFC3339), fblock.SC.GetDBHeight())
+		}
+
+	}
+
 	switch msg.Command() {
 	case wire.CmdCommitChain:
 		msgCommitChain, ok := msg.(*wire.MsgCommitChain)
@@ -271,12 +282,12 @@ func serveMsgRequest(msg wire.FtmInternalMsg) error {
 				return errors.New("Error in build blocks:" + fmt.Sprintf("%+v", msg))
 			}
 			procLog.Infof("PROCESSOR: End of minute msg - wire.CmdInt_EOM:%+v\n", msg)
-            
-            common.FactoidState.EndOfPeriod(int(msgEom.EOM_Type))
-            
+
+			common.FactoidState.EndOfPeriod(int(msgEom.EOM_Type))
+
 			if msgEom.EOM_Type == wire.END_MINUTE_10 {
-              
-                // Process from Orphan pool before the end of process list
+
+				// Process from Orphan pool before the end of process list
 				processFromOrphanPool()
 
 				// Pass the Entry Credit Exchange Rate into the Factoid component
@@ -291,7 +302,7 @@ func serveMsgRequest(msg wire.FtmInternalMsg) error {
 				}
 
 			} else if msgEom.EOM_Type >= wire.END_MINUTE_1 && msgEom.EOM_Type < wire.END_MINUTE_10 {
-                ack, err := plMgr.AddMyProcessListItem(msgEom, nil, msgEom.EOM_Type)
+				ack, err := plMgr.AddMyProcessListItem(msgEom, nil, msgEom.EOM_Type)
 				if err != nil {
 					return err
 				}
@@ -762,7 +773,7 @@ func buildGenesisBlocks() error {
 	data, _ := FBlock.MarshalBinary()
 	procLog.Debugf("\n\n ", common.Sha(data).String(), "\n\n")
 	dchain.AddFBlockToDBEntry(FBlock)
-    procLog.Debugf("Factoid genesis block hash: %v\n", FBlock.GetHash())
+	procLog.Debugf("Factoid genesis block hash: %v\n", FBlock.GetHash())
 	exportFctChain(fchain)
 	// Add transactions from genesis block to factoid balances
 	common.FactoidState.AddTransactionBlock(FBlock)
@@ -788,7 +799,7 @@ func buildGenesisBlocks() error {
 
 // build blocks from all process lists
 func buildBlocks() error {
-	
+
 	// Allocate the first three dbentries for Admin block, ECBlock and Factoid block
 	dchain.AddDBEntry(&common.DBEntry{}) // AdminBlock
 	dchain.AddDBEntry(&common.DBEntry{}) // ECBlock
@@ -805,13 +816,13 @@ func buildBlocks() error {
 
 	// Admin chain
 	aBlock := newAdminBlock(achain)
-	
+
 	dchain.AddABlockToDBEntry(aBlock)
 	exportABlock(aBlock)
 
 	// Factoid chain
 	fBlock := newFactoidBlock(fchain)
-	
+
 	dchain.AddFBlockToDBEntry(fBlock)
 	exportFctBlock(fBlock)
 

process/util.go

@@ -16,6 +16,9 @@ import (
 	"sort"
 )
 
+var _ = util.Trace
+var _ = spew.Sdump
+
 func GetEntryCreditBalance(pubKey *[32]byte) (int32, error) {
 
 	return eCreditMap[string(pubKey[:])], nil
@@ -350,7 +353,7 @@ func fileNotExists(name string) bool {
 //
 // This function is NOT safe for concurrent access.
 func HaveBlockInDB(hash *common.Hash) (bool, error) {
-	util.Trace(spew.Sdump(hash))
+	//util.Trace(spew.Sdump(hash))
 
 	if hash == nil || dchain.Blocks == nil || len(dchain.Blocks) == 0 {
 		return false, nil