Validator: check same round for retry

cmd/validator/README.md

@@ -16,13 +16,13 @@ This can be used along with the [generate_accounts.sh](../../misc/generate_accou
 
 For example here is how you would run the program with accounts generated from `generate_accounts.sh` and errors redirected to a file:
 ```
-~$ ./generate_accounts.sh --pg_user postgres --pg_pass postgres --pg_url localhost --pg_db mainnet_database --pg_port 5432 | ./validator --algod-url http://localhost:4160 --algod-token token_here --indexer-url http://localhost:8980 --threads 4 --retries 5 2> errors.txt
+~$ ./generate_accounts.sh --pg_user postgres --pg_pass postgres --pg_url localhost --pg_db mainnet_database --pg_port 5432 | ./validator --algod-url http://localhost:4160 --algod-token token_here --indexer-url http://localhost:8980 --indexer-token token_here --threads 4 --retries 5 2> errors.txt
 ```
 
 and here is how you would run the program to compare boxes:
 
 ```
-~$ ./generate_boxes.sh --pg_user postgres --pg_pass postgres --pg_url localhost --pg_db mainnet_database --pg_port 5432 | ./validator --algod-url http://localhost:4160 --algod-token token_here --indexer-url http://localhost:8980 --threads 4 --retries 5 2> errors.txt
+~$ ./generate_boxes.sh --pg_user postgres --pg_pass postgres --pg_url localhost --pg_db mainnet_database --pg_port 5432 | ./validator --algod-url http://localhost:4160 --algod-token token_here --indexer-url http://localhost:8980 --indexer-token token_here --threads 4 --retries 5 2> errors.txt
 ```
 
 ## generate_accounts.sh

cmd/validator/core/command.go

@@ -206,9 +206,9 @@ func resultsPrinter(config Params, printCurl, printSkipped bool, results <-chan
 			ErrorLog.Printf("===================================================================")
 			ErrorLog.Printf("%s", time.Now().Format("2006-01-02 3:4:5 PM"))
 			ErrorLog.Printf("Resource: %s", r.Details.Resource)
+			ErrorLog.Printf("Rounds Match: %t", r.SameRound)
 			if r.Details.Resource == "address" {
 				ErrorLog.Printf("Account: %s", r.Details.Address)
-				ErrorLog.Printf("Rounds Match: %t", r.SameRound)
 			}
 			if r.Details.Resource == "box" {
 				ErrorLog.Printf("Appid: %s", r.Details.Appid)

cmd/validator/core/struct_processor.go

@@ -64,8 +64,9 @@ func (gp StructProcessor) ProcessBox(algodData, indexerData []byte) (Result, err
 
 	if !bytes.Equal(algodValue, indexerValue) {
 		return Result{
-			Equal:   false,
-			Retries: 0,
+			Equal:     false,
+			SameRound: indexerResponse.Round == algodResponse.Round,
+			Retries:   0,
 			Details: &ErrorDetails{
 				Resource: "box",
 				Algod:    mustEncode(algodResponse),

cmd/validator/core/validator.go

@@ -209,7 +209,7 @@ func callProcessorBox(processor Processor, appid string, boxname string, config
 			return
 		}
 
-		if result.Equal || (i >= config.Retries) {
+		if result.Equal || result.SameRound || (i >= config.Retries) {
 			// Return when results are equal, or when finished retrying.
 			result.Retries = i
 			if result.Details != nil {