From 1f22f34edfceef2de1e8e2a93b0d24109626d50f Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Mon, 4 Jun 2018 16:34:16 +0400
Subject: [PATCH] flush wal group on stop

Refs #1659
Refs https://github.com/tendermint/tmlibs/pull/217
---
 Gopkg.lock       | 6 +++---
 Gopkg.toml       | 2 +-
 consensus/wal.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 6e34258f4..06d93bb17 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -281,10 +281,10 @@
     "flowrate",
     "log",
     "merkle",
+    "merkle/tmhash",
     "test"
   ]
-  revision = "cc5f287c4798ffe88c04d02df219ecb6932080fd"
-  version = "v0.8.3-rc0"
+  revision = "0803cd354816952a8d8bcba88c592b3eb54ac427"
 
 [[projects]]
   branch = "master"
@@ -382,6 +382,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "d85c98dcac32cc1fe05d006aa75e8985f6447a150a041b972a673a65e7681da9"
+  inputs-digest = "aa8421ead26741e4ff7a59edb48dd7f12c8f29e3d6c0a893f95ea3fa3023a095"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 741979774..1d37c7fd5 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -83,7 +83,7 @@
 
 [[override]]
   name = "github.com/tendermint/tmlibs"
-  version = "~0.8.3-rc0"
+  revision = "0803cd354816952a8d8bcba88c592b3eb54ac427"
 
 [[constraint]]
   name = "google.golang.org/grpc"
diff --git a/consensus/wal.go b/consensus/wal.go
index 80cb8fc3c..3d9bf8afc 100644
--- a/consensus/wal.go
+++ b/consensus/wal.go
@@ -106,8 +106,8 @@ func (wal *baseWAL) OnStart() error {
 }
 
 func (wal *baseWAL) OnStop() {
-	wal.BaseService.OnStop()
 	wal.group.Stop()
+	wal.group.Close()
 }
 
 // Write is called in newStep and for each receive on the