fixed eblock timestamp return in wsapi

michaelbeam · michaelbeam · commit 8df2fe6ed2b4 · 2015-07-21T13:12:22.000-05:00
diff --git a/common/constants.go b/common/constants.go
@@ -37,7 +37,7 @@ const (
 
 	//Server public key for milestone 1
 	SERVER_PUB_KEY = "8cee85c62a9e48039d4ac294da97943c2001be1539809ea5f54721f0c5477a0a"
-    GENESIS_DIR_BLOCK_HASH = "8f0311149ca366b48660f1663b6605dad4c6f88d129a89a4e309d7b5ddc61973"
+    GENESIS_DIR_BLOCK_HASH = "f5252b2208a1b669130f3403903336122bb9f6de1954ceeee195c36e99db43dd"
 )
 
 //---------------------------------------------------------------
diff --git a/wsapi/wsapi.go b/wsapi/wsapi.go
@@ -37,10 +37,14 @@ var _ = fmt.Println
 
 var server = web.NewServer()
 
-var inMessageQ chan wire.FtmInternalMsg
+var (
+	inMessageQ chan wire.FtmInternalMsg
+	dbase database.Db
+)
 
 func Start(db database.Db, inMsgQ chan wire.FtmInternalMsg) {
 	factomapi.SetDB(db)
+	dbase = db
 	factomapi.SetInMsgQueue(inMsgQ)
 	inMessageQ = inMsgQ
 
@@ -241,7 +245,7 @@ func handleDirectoryBlock(ctx *web.Context, keymr string) {
 		Header struct {
 			PrevBlockKeyMR string
 			SequenceNumber uint32
-			TimeStamp      uint64
+			TimeStamp      uint32
 		}
 		EntryBlockList []eblockaddr
 	}
@@ -255,7 +259,7 @@ func handleDirectoryBlock(ctx *web.Context, keymr string) {
 	} else {
 		d.Header.PrevBlockKeyMR = block.Header.PrevKeyMR.String()
 		d.Header.SequenceNumber = block.Header.DBHeight
-		d.Header.TimeStamp = uint64(block.Header.Timestamp) * 60 //Converting from minutes to seconds
+		d.Header.TimeStamp = block.Header.Timestamp * 60
 		for _, v := range block.DBEntries {
 			l := new(eblockaddr)
 			l.ChainID = v.ChainID.String()
@@ -286,7 +290,7 @@ func handleEntryBlock(ctx *web.Context, keymr string) {
 			BlockSequenceNumber uint32
 			ChainID             string
 			PrevKeyMR           string
-			TimeStamp           uint64
+			TimeStamp           uint32
 		}
 		EntryList []entryaddr
 	}
@@ -301,7 +305,11 @@ func handleEntryBlock(ctx *web.Context, keymr string) {
 		e.Header.BlockSequenceNumber = block.Header.EBSequence
 		e.Header.ChainID = block.Header.ChainID.String()
 		e.Header.PrevKeyMR = block.Header.PrevKeyMR.String()
-//		e.Header.TimeStamp = block.Header.StartTime
+
+		if dblock, err := dbase.FetchDBlockByHeight(block.Header.DBHeight); err == nil {
+			e.Header.TimeStamp = dblock.Header.Timestamp * 60
+		}
+
 		for _, v := range block.Body.EBEntries {
 			l := new(entryaddr)
 			l.EntryHash = v.String()
@@ -317,8 +325,6 @@ func handleEntryBlock(ctx *web.Context, keymr string) {
 	} else {
 		ctx.Write(p)
 	}
-
-//	ctx.WriteHeader(httpOK)
 }
 
 func handleEntry(ctx *web.Context, hash string) {
@@ -350,7 +356,6 @@ func handleEntry(ctx *web.Context, hash string) {
 	} else {
 		ctx.Write(p)
 	}
-
 }
 
 func handleChainHead(ctx *web.Context, chainid string) {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ const (`
`37`	`37`
`38`	`38`	`//Server public key for milestone 1`
`39`	`39`	`SERVER_PUB_KEY = "8cee85c62a9e48039d4ac294da97943c2001be1539809ea5f54721f0c5477a0a"`
`40`		`- GENESIS_DIR_BLOCK_HASH = "8f0311149ca366b48660f1663b6605dad4c6f88d129a89a4e309d7b5ddc61973"`
	`40`	`+ GENESIS_DIR_BLOCK_HASH = "f5252b2208a1b669130f3403903336122bb9f6de1954ceeee195c36e99db43dd"`
`41`	`41`	`)`
`42`	`42`
`43`	`43`	`//---------------------------------------------------------------`