Merge pull request #1042 from NebulousLabs/ibd-timeout

5 minute timeout for getting blocks from peers
NebulousLabs · Mar 29, 2016 · a3a591e · a3a591e
2 parents 3a0e7e1 + f367064
commit a3a591e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/modules/consensus/synchronize.go b/modules/consensus/synchronize.go
@@ -42,8 +42,7 @@ var (
 		case "dev":
 			return 40 * time.Second
 		case "standard":
-			// TODO: 45 minutes for 0.5.2 RC2. Change back to 5 minutes for release.
-			return 45 * time.Minute
+			return 5 * time.Minute
 		case "testing":
 			return 5 * time.Second
 		default: