From 340ec79f824ee3e03ef7d03cd0cf2cacffc88f29 Mon Sep 17 00:00:00 2001
From: bojie <bojie@dexon.org>
Date: Sun, 20 Jan 2019 16:45:12 +0800
Subject: travis: re-encrypt GCP credential file (#165)

---
 .ci/DEXON-7548b3622930.json.enc | Bin 2320 -> 2320 bytes
 .travis.yml                     |   4 ++--
 core/blockchain.go              |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/DEXON-7548b3622930.json.enc b/.ci/DEXON-7548b3622930.json.enc
index 62a94fbe0..ec334866f 100644
Binary files a/.ci/DEXON-7548b3622930.json.enc and b/.ci/DEXON-7548b3622930.json.enc differ
diff --git a/.travis.yml b/.travis.yml
index 8ee205c48..b5748f00c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -235,7 +235,7 @@ matrix:
       os: osx
       go: 1.11.x
       env:
-        - gcp-osx
+        - smoke-test
       git:
         submodules: false
       script:
@@ -250,4 +250,4 @@ matrix:
             - ethereum
 before_install:
   - openssl aes-256-cbc -K $encrypted_556a2b2ff7f6_key -iv $encrypted_556a2b2ff7f6_iv
-    -in .ci/DEXON-7548b3622930.json.enc -out ./COBINHOOD-7548b3622930.json -d
+    -in .ci/DEXON-7548b3622930.json.enc -out ./DEXON-7548b3622930.json -d
diff --git a/core/blockchain.go b/core/blockchain.go
index 4177e4178..51b79cb68 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1885,7 +1885,7 @@ func (bc *BlockChain) processBlock(
 	chainBlock := bc.GetBlockByNumber(newBlock.NumberU64())
 	if chainBlock != nil {
 		if chainBlock.Hash() != newBlock.Hash() {
-			return nil, nil, nil, fmt.Errorf("block %v exist but hash is not equal: exist %v expect %v", newBlock.NumberU64(),
+			return nil, nil, nil, fmt.Errorf("block %v exist but hash is not equal: exist %v but get %v", newBlock.NumberU64(),
 				chainBlock.Hash(), newBlock.Hash())
 		}
 
-- 
cgit v1.2.3