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

ThePiachu · ThePiachu · commit dc891c165ac8 · 2015-07-24T14:38:42.000-07:00
Conflicts:
	database/ldb/ablock.go
	database/ldb/dblock.go
diff --git a/consensus/plistmgr.go b/consensus/plistmgr.go
@@ -111,7 +111,7 @@ func (plMgr *ProcessListMgr) InitProcessListFromOrphanMap() error {
 // Create a new process list item and add it to the MyProcessList
 func (plMgr *ProcessListMgr) AddMyProcessListItem(msg wire.FtmInternalMsg, hash *wire.ShaHash, msgType byte) (ack *wire.MsgAcknowledgement, err error) {
 
-	ack = wire.NewMsgAcknowledgement(plMgr.NextDBlockHeight, uint32(plMgr.MyProcessList.nextIndex), hash, msgType) //??
+	ack = wire.NewMsgAcknowledgement(plMgr.NextDBlockHeight, uint32(plMgr.MyProcessList.nextIndex), hash, msgType) 
 	// Sign the ack using server private keys
 	bytes, _ := ack.GetBinaryForSignature()
 	ack.Signature = *plMgr.SignAck(bytes).Sig
diff --git a/database/ldb/ablock.go b/database/ldb/ablock.go
@@ -93,7 +93,8 @@ func (db *LevelDb) FetchAllABlocks() (aBlocks []common.AdminBlock, err error) {
 		if err != nil {
 			return nil, err
 		}
-		aBlock.ABHash = common.Sha(iter.Value()) //to be optimized??
+		//TODO: to be optimized??
+		aBlock.ABHash = common.Sha(iter.Value())
 
 		aBlockSlice = append(aBlockSlice, aBlock)
 
diff --git a/database/ldb/dblock.go b/database/ldb/dblock.go
@@ -379,7 +379,8 @@ func (db *LevelDb) FetchAllDBlocks() (dBlocks []common.DirectoryBlock, err error
 		if err != nil {
 			return nil, err
 		}
-		dBlock.DBHash = common.Sha(iter.Value()) //to be optimized??
+		//TODO: to be optimized??
+		dBlock.DBHash = common.Sha(iter.Value())
 
 		dBlockSlice = append(dBlockSlice, dBlock)
 
diff --git a/database/ldb/leveldb.go b/database/ldb/leveldb.go
@@ -68,7 +68,6 @@ const (
 	STATUS_PROCESSED
 )
 
-// chain type key prefix ??
 var currentChainType uint32 = 1
 
 var isLookupDB bool = true // to be put in property file
@@ -100,7 +99,6 @@ type LevelDb struct {
 }
 var CurrentDBVersion int32 = 1
 
-//to be removed??
 func OpenLevelDB(dbpath string, create bool) (pbdb database.Db, err error) {
 	return openDB(dbpath, create)
 }
@@ -116,8 +114,6 @@ func openDB(dbpath string, create bool) (pbdb database.Db, err error) {
 			
 			// Initialize db
 			db.lastDirBlkHeight = -1
-			//			db.txUpdateMap = map[wire.ShaHash]*txUpdateObj{}
-			//			db.txSpentUpdateMap = make(map[wire.ShaHash]*spentTxUpdate)
 						
 			pbdb = &db
 		}
@@ -153,11 +149,9 @@ func openDB(dbpath string, create bool) (pbdb database.Db, err error) {
 		}
 	}
 
-	//myCache := cache.NewEmptyCache()
+
 	opts := &opt.Options{
-		//		BlockCacher: opt.DefaultBlockCacher,
 		Compression: opt.NoCompression,
-		//		OpenFilesCacher: opt.DefaultOpenFilesCacher,
 	}
 
 	switch dbversion {
diff --git a/factomd/factomd.go b/factomd/factomd.go
@@ -69,7 +69,7 @@ func factomdMain() error {
 	// Start the wsapi server module in a separate go-routine
 	wsapi.Start(db, inMsgQueue)
 
-	// wait till the initialization is complete in processor - to be improved??
+	// wait till the initialization is complete in processor
 	hash, _ := db.FetchDBHashByHeight(0)
 	if hash != nil {
 		for true {
diff --git a/process/processor.go b/process/processor.go
@@ -47,7 +47,7 @@ var (
 	inCtlMsgQueue  chan wire.FtmInternalMsg //incoming message queue for factom control messages
 	outCtlMsgQueue chan wire.FtmInternalMsg //outgoing message queue for factom control messages
 
-	// To be moved to ftmMemPool??
+	//TODO: To be moved to ftmMemPool??
 	chainIDMap     map[string]*common.EChain // ChainIDMap with chainID string([32]byte) as key
 	commitChainMap = make(map[string]*common.CommitChain, 0)
 	commitEntryMap = make(map[string]*common.CommitEntry, 0)
@@ -859,7 +859,6 @@ func buildBlocks() error {
 	// Directory Block chain
 	procLog.Debug("in buildBlocks")
 	dbBlock := newDirectoryBlock(dchain)
-	// Check block hash if genesis block here??
 
 	// Generate the inventory vector and relay it.
 	binary, _ := dbBlock.MarshalBinary()
diff --git a/process/syncup.go b/process/syncup.go
@@ -89,7 +89,6 @@ func procesECBlock(msg *wire.MsgECBlock) error {
 	//Add it to mem pool before saving it in db
 	fMemPool.addBlockMsg(msg, msg.ECBlock.Header.Hash().String())
 
-	// for debugging??
 	procLog.Debug("SyncUp: MsgCBlock DBHeight=", msg.ECBlock.Header.DBHeight)
 
 	return nil
@@ -111,7 +110,6 @@ func processEBlock(msg *wire.MsgEBlock) error {
 	//Add it to mem pool before saving it in db
 	fMemPool.addBlockMsg(msg, msg.EBlk.KeyMR().String()) // store it in mem pool with MR as the key
 
-	// for debugging??
 	procLog.Debug("SyncUp: MsgEBlock DBHeight=", msg.EBlk.Header.DBHeight)
 
 	return nil
@@ -169,8 +167,7 @@ func validateAndStoreBlocks(fMemPool *ftmMemPool, db database.Db, dchain *common
 		} else {
 			time.Sleep(time.Duration(sleeptime * 1000000)) // Nanoseconds for duration
 
-			//send an internal msg to sync up with peers
-			// ??
+			//TODO: send an internal msg to sync up with peers
 		}
 
 	}
diff --git a/process/timer.go b/process/timer.go
@@ -33,7 +33,7 @@ func (bt *BlockTimer) StartBlockTimer() {
 		for i := 0; i < 10; i++ {
 			eomMsg := &wire.MsgInt_EOM{
 				EOM_Type:         wire.END_MINUTE_1 + byte(i),
-				NextDBlockHeight: bt.nextDBlockHeight, //??
+				NextDBlockHeight: bt.nextDBlockHeight, 
 			}
 
 			//send the end-of-minute message to processor

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ func (db *LevelDb) FetchAllABlocks() (aBlocks []common.AdminBlock, err error) {`
`93`	`93`	`if err != nil {`
`94`	`94`	`return nil, err`
`95`	`95`	`}`
`96`		`- aBlock.ABHash = common.Sha(iter.Value()) //to be optimized??`
	`96`	`+ //TODO: to be optimized??`
	`97`	`+ aBlock.ABHash = common.Sha(iter.Value())`
`97`	`98`
`98`	`99`	`aBlockSlice = append(aBlockSlice, aBlock)`
`99`	`100`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,8 @@ func (db *LevelDb) FetchAllDBlocks() (dBlocks []common.DirectoryBlock, err error`
`379`	`379`	`if err != nil {`
`380`	`380`	`return nil, err`
`381`	`381`	`}`
`382`		`- dBlock.DBHash = common.Sha(iter.Value()) //to be optimized??`
	`382`	`+ //TODO: to be optimized??`
	`383`	`+ dBlock.DBHash = common.Sha(iter.Value())`
`383`	`384`
`384`	`385`	`dBlockSlice = append(dBlockSlice, dBlock)`
`385`	`386`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ const (`
`68`	`68`	`STATUS_PROCESSED`
`69`	`69`	`)`
`70`	`70`
`71`		`-// chain type key prefix ??`
`72`	`71`	`var currentChainType uint32 = 1`
`73`	`72`
`74`	`73`	`var isLookupDB bool = true // to be put in property file`
`@@ -100,7 +99,6 @@ type LevelDb struct {`
`100`	`99`	`}`
`101`	`100`	`var CurrentDBVersion int32 = 1`
`102`	`101`
`103`		`-//to be removed??`
`104`	`102`	`func OpenLevelDB(dbpath string, create bool) (pbdb database.Db, err error) {`
`105`	`103`	`return openDB(dbpath, create)`
`106`	`104`	`}`
`@@ -116,8 +114,6 @@ func openDB(dbpath string, create bool) (pbdb database.Db, err error) {`
`116`	`114`
`117`	`115`	`// Initialize db`
`118`	`116`	`db.lastDirBlkHeight = -1`
`119`		`- // db.txUpdateMap = map[wire.ShaHash]*txUpdateObj{}`
`120`		`- // db.txSpentUpdateMap = make(map[wire.ShaHash]*spentTxUpdate)`
`121`	`117`
`122`	`118`	`pbdb = &db`
`123`	`119`	`}`
`@@ -153,11 +149,9 @@ func openDB(dbpath string, create bool) (pbdb database.Db, err error) {`
`153`	`149`	`}`
`154`	`150`	`}`
`155`	`151`
`156`		`- //myCache := cache.NewEmptyCache()`
	`152`	`+`
`157`	`153`	`opts := &opt.Options{`
`158`		`- // BlockCacher: opt.DefaultBlockCacher,`
`159`	`154`	`Compression: opt.NoCompression,`
`160`		`- // OpenFilesCacher: opt.DefaultOpenFilesCacher,`
`161`	`155`	`}`
`162`	`156`
`163`	`157`	`switch dbversion {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func (bt *BlockTimer) StartBlockTimer() {`
`33`	`33`	`for i := 0; i < 10; i++ {`
`34`	`34`	`eomMsg := &wire.MsgInt_EOM{`
`35`	`35`	`EOM_Type: wire.END_MINUTE_1 + byte(i),`
`36`		`- NextDBlockHeight: bt.nextDBlockHeight, //??`
	`36`	`+ NextDBlockHeight: bt.nextDBlockHeight,`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`//send the end-of-minute message to processor`