Moved the reveal chain validation from entry.go to processor. #676

jl8610 · jl8610 · commit dfda0dc47145 · 2015-08-27T15:07:23.000-05:00
diff --git a/common/entry.go b/common/entry.go
@@ -37,17 +37,6 @@ func NewEntry() *Entry {
 	return e
 }
 
-func ValidateRevealEntryChainID(e *Entry) error {
-	if e == nil {
-		return fmt.Errorf("No entry provided")
-	}
-	expectedChainID := NewChainID(e)
-	if !expectedChainID.IsSameAs(e.ChainID) {
-		return fmt.Errorf("Invalid ChainID.")
-	}
-	return nil
-}
-
 // NewChainID generates a ChainID from an entry. ChainID = Sha(Sha(ExtIDs[0]) +
 // Sha(ExtIDs[1] + ... + Sha(ExtIDs[n]))
 func NewChainID(e *Entry) *Hash {
diff --git a/process/processor.go b/process/processor.go
@@ -566,6 +566,12 @@ func processRevealEntry(msg *wire.MsgRevealEntry) error {
 			fMemPool.addOrphanMsg(msg, h)
 			return fmt.Errorf("Credit needs to paid first before an entry is revealed: %s", e.Hash().String())
 		}
+	
+		//validate chain id for the first entry	
+		expectedChainID := common.NewChainID(e)
+		if !expectedChainID.IsSameAs(e.ChainID) {
+			return fmt.Errorf("Invalid ChainID for entry: %s", e.Hash().String())			
+		}
 		
 		//validate chainid hash in the commitChain
 		chainIDHash := common.DoubleSha(e.ChainID.Bytes())
diff --git a/wsapi/wsapi.go b/wsapi/wsapi.go
@@ -201,14 +201,6 @@ func handleRevealEntry(ctx *web.Context) {
 		}
 	}
 
-	err := common.ValidateRevealEntryChainID(entry)
-	if err != nil {
-		wsLog.Error(err)
-		ctx.WriteHeader(httpBad)
-		ctx.Write([]byte(err.Error()))
-		return
-	}
-
 	if err := factomapi.RevealEntry(entry); err != nil {
 		wsLog.Error(err)
 		ctx.WriteHeader(httpBad)

Original file line number	Diff line number	Diff line change
`@@ -201,14 +201,6 @@ func handleRevealEntry(ctx *web.Context) {`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`
`204`		`- err := common.ValidateRevealEntryChainID(entry)`
`205`		`- if err != nil {`
`206`		`- wsLog.Error(err)`
`207`		`- ctx.WriteHeader(httpBad)`
`208`		`- ctx.Write([]byte(err.Error()))`
`209`		`- return`
`210`		`- }`
`211`		`-`
`212`	`204`	`if err := factomapi.RevealEntry(entry); err != nil {`
`213`	`205`	`wsLog.Error(err)`
`214`	`206`	`ctx.WriteHeader(httpBad)`