Temporary bug workaround.

ThePiachu · ThePiachu · commit 2e77f2343383 · 2015-07-24T17:49:44.000-07:00
diff --git a/anchor/anchor.go b/anchor/anchor.go
@@ -246,7 +246,7 @@ func sendRawTransaction(msgtx *wire.MsgTx) (*wire.ShaHash, error) {
 	if err := msgtx.BtcEncode(&buf, wire.ProtocolVersion); err != nil {
 		// Hitting OOM by growing or writing to a bytes.Buffer already
 		// panics, and all returned errors are unexpected.
-		//panic(err) 
+		//panic(err)
 		//TODO: should we have retry logic?
 		return nil, err
 	}
@@ -319,16 +319,21 @@ func createBtcdNotificationHandlers() btcrpcclient.NotificationHandlers {
 func InitAnchor(ldb database.Db) {
 	anchorLog.Debug("InitAnchor")
 	db = ldb
-	dirBlockInfoMap, _ = db.FetchAllUnconfirmedDirBlockInfo()
+	var err error
+	dirBlockInfoMap, err = db.FetchAllUnconfirmedDirBlockInfo()
+	if err != nil {
+		anchorLog.Error("InitAnchor error - " + err.Error())
+		return
+	}
 
-	if err := initRPCClient(); err != nil {
+	if err = initRPCClient(); err != nil {
 		anchorLog.Error(err.Error())
 		return
 	}
 	//defer shutdown(dclient)
 	//defer shutdown(wclient)
 
-	if err := initWallet(); err != nil {
+	if err = initWallet(); err != nil {
 		anchorLog.Error(err.Error())
 		return
 	}
diff --git a/database/ldb/dblock.go b/database/ldb/dblock.go
@@ -435,7 +435,8 @@ func (db *LevelDb) FetchAllUnconfirmedDirBlockInfo() (dirBlockInfoMap map[string
 		if iter.Value()[len(iter.Value())-1] == 0 {
 			_, err := dBInfo.UnmarshalBinaryData(iter.Value())
 			if err != nil {
-				return nil, err
+				//TODO: FIXME: return nil, err , rather than an incomplete map; fix the underlying problem
+				return dirBlockInfoMap, err
 			}
 			dirBlockInfoMap[dBInfo.DBMerkleRoot.String()] = dBInfo
 		}

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,8 @@ func (db *LevelDb) FetchAllUnconfirmedDirBlockInfo() (dirBlockInfoMap map[string`
`435`	`435`	`if iter.Value()[len(iter.Value())-1] == 0 {`
`436`	`436`	`_, err := dBInfo.UnmarshalBinaryData(iter.Value())`
`437`	`437`	`if err != nil {`
`438`		`- return nil, err`
	`438`	`+ //TODO: FIXME: return nil, err , rather than an incomplete map; fix the underlying problem`
	`439`	`+ return dirBlockInfoMap, err`
`439`	`440`	`}`
`440`	`441`	`dirBlockInfoMap[dBInfo.DBMerkleRoot.String()] = dBInfo`
`441`	`442`	`}`