Merge pull request #1 from mysteriumnetwork/exit_code

reflect result in exit code
mysteriumnetwork · Feb 28, 2022 · aa0b4e9 · aa0b4e9
2 parents 43873ac + 4b88064
commit aa0b4e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cmd/ethdiff/main.go b/cmd/ethdiff/main.go
@@ -55,12 +55,15 @@ func run() int {
 	leftClient, rightClient := diff.NewRetryingClient(leftClientResult.Client, *retries),
 		diff.NewRetryingClient(rightClientResult.Client, *retries)
 
-	lastCommonBlock, err := diff.LastCommonBlock(ctx, leftClient, rightClient, *offset)
+	lastCommonBlock, observedHeight, err := diff.LastCommonBlock(ctx, leftClient, rightClient, *offset)
 	if err != nil {
 		log.Fatalf("LastCommonBlock(%v, %v) error: %v", flag.Arg(0), flag.Arg(1), err)
 	}
 
 	fmt.Printf("0x%x\n", lastCommonBlock)
+	if (lastCommonBlock != observedHeight) {
+		return 3
+	}
 
 	return 0
 }

diff --git a/diff/diff.go b/diff/diff.go
@@ -77,10 +77,10 @@ func getBlocks(ctx context.Context, left, right Client, blockNumber uint64) (*ty
 	return leftBlock, rightBlock, nil
 }
 
-func LastCommonBlock(ctx context.Context, left, right Client, offset uint64) (uint64, error) {
+func LastCommonBlock(ctx context.Context, left, right Client, offset uint64) (uint64, uint64, error) {
 	leftLatestBlock, rightLatestBlock, err := getNumbers(ctx, left, right)
 	if err != nil {
-		return 0, err
+		return 0, 0, err
 	}
 	highestCommonBlock := max(leftLatestBlock, rightLatestBlock)
 	log.Printf("highestCommonBlock = 0x%x (%d)", highestCommonBlock, highestCommonBlock)
@@ -101,7 +101,7 @@ func LastCommonBlock(ctx context.Context, left, right Client, offset uint64) (ui
 		log.Printf("searchFunc(0x%x) = %v", blockNumber, result)
 		return result, nil
 	})
-	return res - 1, err
+	return res - 1, highestCommonBlock, err
 }
 
 func max(x, y uint64) uint64 {