From 8753d6d59a569e1d8949a5e068d4b6dfc555b429 Mon Sep 17 00:00:00 2001
From: Christopher Goes <cwgoes@protonmail.ch>
Date: Wed, 13 Jun 2018 07:25:14 +0200
Subject: [PATCH] Revert "Merge PR #1228: Update to Tendermint develop" (#1231)

This reverts commit 1c8dbd1087fbc6e93332ec8dd25f4277d57a0b92.
---
 Gopkg.lock        | 9 +++++----
 Gopkg.toml        | 4 ++--
 server/tm_cmds.go | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 515c4dc4f..07a3c6d5b 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -267,8 +267,8 @@
     "server",
     "types"
   ]
-  revision = "198dccf0ddfd1bb176f87657e3286a05a6ed9540"
-  version = "v0.12.0"
+  revision = "ebee2fe114020aa49c70bbbae50b7079fc7e7b90"
+  version = "v0.11.0"
 
 [[projects]]
   branch = "master"
@@ -347,7 +347,8 @@
     "types",
     "version"
   ]
-  revision = "fa32dc51819c5eb85a51a239b785c930ac8ad5f0"
+  revision = "27bd1deabe4ba6a2d9b463b8f3e3f1e31b993e61"
+  version = "v0.20.0"
 
 [[projects]]
   branch = "develop"
@@ -462,6 +463,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "4f488b27a585db0df82292eb72740bee8b6c1e50e7d593bf1e45785195d09938"
+  inputs-digest = "31f69b235b2d8f879a215c9e8ca0919adc62d21f6830b17931a3a0efb058721f"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 5428e7421..77de1b78d 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -54,7 +54,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/abci"
-  version = "=0.12.0"
+  version = "=0.11.0"
 
 [[constraint]]
   name = "github.com/tendermint/go-crypto"
@@ -70,7 +70,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  revision = "fa32dc51819c5eb85a51a239b785c930ac8ad5f0"
+  version = "=0.20.0"
 
 [[override]]
   name = "github.com/tendermint/tmlibs"
diff --git a/server/tm_cmds.go b/server/tm_cmds.go
index 25d417a66..7dccaf531 100644
--- a/server/tm_cmds.go
+++ b/server/tm_cmds.go
@@ -72,7 +72,7 @@ func UnsafeResetAllCmd(ctx *Context) *cobra.Command {
 		Short: "Reset blockchain database, priv_validator.json file, and the logger",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cfg := ctx.Config
-			tcmd.ResetAll(cfg.DBDir(), cfg.P2P.AddrBookFile(), cfg.PrivValidatorFile(), ctx.Logger)
+			tcmd.ResetAll(cfg.DBDir(), cfg.PrivValidatorFile(), ctx.Logger)
 			return nil
 		},
 	}