problem: using "upstreams" on two levels of config is confusing

2020-03-23 23:41:32 -04:00
parent 014461520e
commit 695b38f702
6 changed files with 6 additions and 6 deletions
--- a/README.adoc
+++ b/README.adoc
@@ -76,7 +76,7 @@ proxy:
    - id: kovan
      blockchain: kovan

-upstreams:
+cluster:
  upstreams:
    - id: infura-eth
      chain: ethereum
--- a/demo/quick-start/dshackle.yaml
+++ b/demo/quick-start/dshackle.yaml
@@ -3,7 +3,7 @@ port: 2449
 tls:
  enabled: false

-upstreams:
+cluster:
  upstreams:
    - id: infura-eth
      chain: ethereum
--- a/docs/02-quick-start.adoc
+++ b/docs/02-quick-start.adoc
@@ -29,7 +29,7 @@ proxy:
      blockchain: ethereum
    - id: kovan
      blockchain: kovan
-upstreams:
+cluster:
  upstreams:
    - id: infura-eth
      chain: ethereum
--- a/docs/03-server-config.adoc
+++ b/docs/03-server-config.adoc
@@ -16,7 +16,7 @@ tls:
  client:
    require: true
    ca: "ca.crt"
-upstreams:
+cluster:
  include: "upstreams.yaml"
 ----

--- a/src/main/kotlin/io/emeraldpay/dshackle/config/UpstreamsConfigReader.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/config/UpstreamsConfigReader.kt
@@ -38,7 +38,7 @@ class UpstreamsConfigReader(
    }

    override fun read(input: MappingNode?): UpstreamsConfig? {
-        return getMapping(input, "upstreams")?.let {
+        return getMapping(input, "cluster")?.let {
            readInternal(it)
        }
    }
--- a/src/test/resources/dshackle-full.yaml
+++ b/src/test/resources/dshackle-full.yaml
@@ -34,7 +34,7 @@ proxy:
    - id: kovan
      blockchain: kovan

-upstreams:
+cluster:
  defaults:
    - chains:
        - ethereum