Merge pull request #92 from gagarin55/devel

catena2w · catena2w · commit 2df871aeb591 · 2016-05-31T12:07:20.000Z
fixed wrong max-rollback settngs key, changed to maxRollback
diff --git a/scorex-transaction/src/main/scala/scorex/transaction/TransactionSettings.scala b/scorex-transaction/src/main/scala/scorex/transaction/TransactionSettings.scala
@@ -9,6 +9,6 @@ trait TransactionSettings {
   lazy val history = (settingsJSON \ "history").asOpt[String].getOrElse(DefaultHistory)
 
   private val DefaultMaxRollback = 100
-  lazy val MaxRollback = (settingsJSON \ "max-rollback").asOpt[Int].getOrElse(DefaultMaxRollback)
+  lazy val MaxRollback = (settingsJSON \ "maxRollback").asOpt[Int].getOrElse(DefaultMaxRollback)
 
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ trait TransactionSettings {`
`9`	`9`	`lazy val history = (settingsJSON \ "history").asOpt[String].getOrElse(DefaultHistory)`
`10`	`10`
`11`	`11`	`private val DefaultMaxRollback = 100`
`12`		`- lazy val MaxRollback = (settingsJSON \ "max-rollback").asOpt[Int].getOrElse(DefaultMaxRollback)`
	`12`	`+ lazy val MaxRollback = (settingsJSON \ "maxRollback").asOpt[Int].getOrElse(DefaultMaxRollback)`
`13`	`13`
`14`	`14`	`}`