From 695b38f702de5b9344a55cd0819cd1f594073f78 Mon Sep 17 00:00:00 2001
From: Igor Artamonov <igor@artamonov.ru>
Date: Mon, 23 Mar 2020 23:41:32 -0400
Subject: [PATCH] problem: using "upstreams" on two levels of config is
 confusing

---
 README.adoc                                                     | 2 +-
 demo/quick-start/dshackle.yaml                                  | 2 +-
 docs/02-quick-start.adoc                                        | 2 +-
 docs/03-server-config.adoc                                      | 2 +-
 .../io/emeraldpay/dshackle/config/UpstreamsConfigReader.kt      | 2 +-
 src/test/resources/dshackle-full.yaml                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.adoc b/README.adoc
index 5b9e0a09..3ed9044c 100644
--- a/README.adoc
+++ b/README.adoc
@@ -76,7 +76,7 @@ proxy:
     - id: kovan
       blockchain: kovan
 
-upstreams:
+cluster:
   upstreams:
     - id: infura-eth
       chain: ethereum
diff --git a/demo/quick-start/dshackle.yaml b/demo/quick-start/dshackle.yaml
index fa1a5409..490ba154 100644
--- 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
diff --git a/docs/02-quick-start.adoc b/docs/02-quick-start.adoc
index 8792f855..9d7737b1 100644
--- 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
diff --git a/docs/03-server-config.adoc b/docs/03-server-config.adoc
index 7f35d6f8..e115265f 100644
--- 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"
 ----
 
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/config/UpstreamsConfigReader.kt b/src/main/kotlin/io/emeraldpay/dshackle/config/UpstreamsConfigReader.kt
index eaa5631c..a8d8a2a7 100644
--- 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)
         }
     }
diff --git a/src/test/resources/dshackle-full.yaml b/src/test/resources/dshackle-full.yaml
index cd478fd7..bd089499 100644
--- 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