problem: unused options
This commit is contained in:
@@ -11,9 +11,6 @@ class UpstreamsConfig {
|
|||||||
var upstreams: MutableList<Upstream<*>> = ArrayList<Upstream<*>>()
|
var upstreams: MutableList<Upstream<*>> = ArrayList<Upstream<*>>()
|
||||||
|
|
||||||
open class Options {
|
open class Options {
|
||||||
@Deprecated("remove it")
|
|
||||||
var quorum: Int = 1
|
|
||||||
var disableSyncing: Boolean? = null
|
|
||||||
var disableValidation: Boolean? = null
|
var disableValidation: Boolean? = null
|
||||||
|
|
||||||
var minPeers: Int? = 1
|
var minPeers: Int? = 1
|
||||||
@@ -29,7 +26,6 @@ class UpstreamsConfig {
|
|||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
val copy = Options()
|
val copy = Options()
|
||||||
copy.disableSyncing = if (this.disableSyncing != null) this.disableSyncing else additional.disableSyncing
|
|
||||||
copy.minPeers = if (this.minPeers != null) this.minPeers else additional.minPeers
|
copy.minPeers = if (this.minPeers != null) this.minPeers else additional.minPeers
|
||||||
copy.disableValidation = if (this.disableValidation != null) this.disableValidation else additional.disableValidation
|
copy.disableValidation = if (this.disableValidation != null) this.disableValidation else additional.disableValidation
|
||||||
return copy
|
return copy
|
||||||
@@ -38,7 +34,6 @@ class UpstreamsConfig {
|
|||||||
companion object {
|
companion object {
|
||||||
fun getDefaults(): Options {
|
fun getDefaults(): Options {
|
||||||
val options = Options()
|
val options = Options()
|
||||||
options.disableSyncing = true
|
|
||||||
options.minPeers = 1
|
options.minPeers = 1
|
||||||
options.disableValidation = false
|
options.disableValidation = false
|
||||||
return options
|
return options
|
||||||
|
|||||||
@@ -128,9 +128,6 @@ class UpstreamsConfigReader {
|
|||||||
|
|
||||||
internal fun readOptions(values: MappingNode): UpstreamsConfig.Options {
|
internal fun readOptions(values: MappingNode): UpstreamsConfig.Options {
|
||||||
val options = UpstreamsConfig.Options()
|
val options = UpstreamsConfig.Options()
|
||||||
getValueAsBool(values, "disable-syncing")?.let {
|
|
||||||
options.disableSyncing = it
|
|
||||||
}
|
|
||||||
getValueAsInt(values, "min-peers")?.let {
|
getValueAsInt(values, "min-peers")?.let {
|
||||||
options.minPeers = it
|
options.minPeers = it
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ class UpstreamsConfigReaderSpec extends Specification {
|
|||||||
with(get(0)) {
|
with(get(0)) {
|
||||||
chains == ["ethereum"]
|
chains == ["ethereum"]
|
||||||
options.minPeers == 3
|
options.minPeers == 3
|
||||||
options.disableSyncing
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
act.upstreams.size() == 2
|
act.upstreams.size() == 2
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ defaultOptions:
|
|||||||
- chains:
|
- chains:
|
||||||
- ethereum
|
- ethereum
|
||||||
options:
|
options:
|
||||||
disable-syncing: true
|
|
||||||
min-peers: 3
|
min-peers: 3
|
||||||
|
|
||||||
upstreams:
|
upstreams:
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ defaultOptions:
|
|||||||
- chains:
|
- chains:
|
||||||
- ethereum
|
- ethereum
|
||||||
options:
|
options:
|
||||||
disable-syncing: true
|
|
||||||
min-peers: 3
|
min-peers: 3
|
||||||
|
|
||||||
upstreams:
|
upstreams:
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ defaultOptions:
|
|||||||
- chains:
|
- chains:
|
||||||
- ethereum
|
- ethereum
|
||||||
options:
|
options:
|
||||||
disable-syncing: true
|
|
||||||
min-peers: 3
|
min-peers: 3
|
||||||
|
|
||||||
upstreams:
|
upstreams:
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ defaultOptions:
|
|||||||
- chains:
|
- chains:
|
||||||
- ethereum
|
- ethereum
|
||||||
options:
|
options:
|
||||||
disable-syncing: true
|
|
||||||
min-peers: 3
|
min-peers: 3
|
||||||
|
|
||||||
upstreams:
|
upstreams:
|
||||||
|
|||||||
Reference in New Issue
Block a user