Fixed the error for Blocks test

jl8610 · jl8610 · commit dac153d69380 · 2015-07-13T16:04:34.000-05:00
diff --git a/factomd/blocks_test.go b/factomd/blocks_test.go
@@ -8,11 +8,13 @@ import (
 	"testing"
 )
 
-var dirBlockHeight uint32 = 241
+var dirBlockHeight uint32 = 0
 
 func TestBlocks(t *testing.T) {
 	fmt.Println("\nTest Blocks===========================================================================")
 
+	loadConfigurations()
+	
 	initDB()
 
 	// directory block ------------------
@@ -34,16 +36,16 @@ func TestBlocks(t *testing.T) {
 	for _, dbEntry := range dblk.DBEntries {
 		switch dbEntry.ChainID.String() {
 		case ecchainid.String():
-			ecblk, _ := db.FetchECBlockByHash(dbEntry.MerkleRoot)
+			ecblk, _ := db.FetchECBlockByHash(dbEntry.KeyMR)
 			t.Logf("ecblk=%s\n", spew.Sdump(ecblk))
 		case achainid.String():
-			ablk, _ := db.FetchABlockByHash(dbEntry.MerkleRoot)
+			ablk, _ := db.FetchABlockByHash(dbEntry.KeyMR)
 			t.Logf("ablk=%s\n", spew.Sdump(ablk))
 		case fchainid.String():
-			fblk, _ := db.FetchFBlockByHash(dbEntry.MerkleRoot)
+			fblk, _ := db.FetchFBlockByHash(dbEntry.KeyMR)
 			t.Logf("fblk=%s\n", spew.Sdump(fblk))
 		default:
-			eBlk, _ := db.FetchEBlockByMR(dbEntry.MerkleRoot)
+			eBlk, _ := db.FetchEBlockByMR(dbEntry.KeyMR)
 			// validate every entry in EBlock
 			for _, ebEntry := range eBlk.EBEntries {
 				// continue if the entry arleady exists in db
diff --git a/factomd/log.go b/factomd/log.go
@@ -20,5 +20,5 @@ var (
 
 // setup subsystem loggers
 var (
-	ftmdLog = factomlog.New(logfile, logLevel, "ftmd")
+	ftmdLog = factomlog.New(logfile, logLevel, "FTMD")
 )
diff --git a/process/log.go b/process/log.go
@@ -20,5 +20,5 @@ var (
 
 // setup subsystem loggers
 var (
-	procLog = factomlog.New(logfile, logLevel, "proc")
+	procLog = factomlog.New(logfile, logLevel, "PROC")
 )
diff --git a/process/processor.go b/process/processor.go
@@ -76,7 +76,6 @@ var (
 
 // Get the configurations
 func LoadConfigurations(cfg *util.FactomdConfig) {
-	util.Trace("LoadConf")
 
 	//setting the variables by the valued form the config file
 	logLevel = cfg.Log.LogLevel
@@ -88,10 +87,6 @@ func LoadConfigurations(cfg *util.FactomdConfig) {
 
 	FactomdUser = cfg.Btc.RpcUser
 	FactomdPass = cfg.Btc.RpcPass
-
-	util.Trace(logLevel)
-	util.Trace(ldbpath)
-	util.Trace(FactomdUser)
 }
 
 // Initialize the processor
diff --git a/process/util.go b/process/util.go
@@ -332,7 +332,7 @@ func copyCreditMap(
 func printCreditMap() {
 	procLog.Debug("eCreditMap:")
 	for key := range eCreditMap {
-		procLog.Debugf("Key: %x Value %d\n", key, eCreditMap[key])
+		procLog.Debugf("Entry credit Key: %x Value %d", key, eCreditMap[key])
 	}
 }
 
diff --git a/util/config.go b/util/config.go
@@ -84,6 +84,9 @@ RpcClientPass 			= "notarychain"
 BtcTransFee				= 0.0001
 CertHomePathBtcd		= "btcd"
 RpcBtcdHost 			= "localhost:18334"
+RpcUser					= ""
+RpcPass					= ""
+
 
 [wsapi]
 ApplicationName			= "Factom/wsapi"
diff --git a/wsapi/log.go b/wsapi/log.go
@@ -20,7 +20,7 @@ var (
 
 // setup subsystem loggers
 var (
-	rpcLog    = factomlog.New(logfile, logLevel, "rpc")
-	serverLog = factomlog.New(logfile, logLevel, "serv")
-	wsLog     = factomlog.New(logfile, logLevel, "wsapi")
+	rpcLog    = factomlog.New(logfile, logLevel, "RPC")
+	serverLog = factomlog.New(logfile, logLevel, "SERV")
+	wsLog     = factomlog.New(logfile, logLevel, "WSAPI")
 )

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ var (`
`20`	`20`
`21`	`21`	`// setup subsystem loggers`
`22`	`22`	`var (`
`23`		`- ftmdLog = factomlog.New(logfile, logLevel, "ftmd")`
	`23`	`+ ftmdLog = factomlog.New(logfile, logLevel, "FTMD")`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ func copyCreditMap(`
`332`	`332`	`func printCreditMap() {`
`333`	`333`	`procLog.Debug("eCreditMap:")`
`334`	`334`	`for key := range eCreditMap {`
`335`		`- procLog.Debugf("Key: %x Value %d\n", key, eCreditMap[key])`
	`335`	`+ procLog.Debugf("Entry credit Key: %x Value %d", key, eCreditMap[key])`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`