aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbojie <bojie@dexon.org>2019-01-20 16:45:12 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 21:32:56 +0800
commit3af3183ce47d29543fe19212f4405f4f832bcf93 (patch)
tree0649eb96c4e915a50afd1999f674065f8566babf
parent46827bc51d5b39d2f28654f19a63796cfe6b9d56 (diff)
downloadgo-tangerine-3af3183ce47d29543fe19212f4405f4f832bcf93.tar
go-tangerine-3af3183ce47d29543fe19212f4405f4f832bcf93.tar.gz
go-tangerine-3af3183ce47d29543fe19212f4405f4f832bcf93.tar.bz2
go-tangerine-3af3183ce47d29543fe19212f4405f4f832bcf93.tar.lz
go-tangerine-3af3183ce47d29543fe19212f4405f4f832bcf93.tar.xz
go-tangerine-3af3183ce47d29543fe19212f4405f4f832bcf93.tar.zst
go-tangerine-3af3183ce47d29543fe19212f4405f4f832bcf93.zip
travis: re-encrypt GCP credential file (#165)
-rw-r--r--.ci/DEXON-7548b3622930.json.encbin2320 -> 2320 bytes
-rw-r--r--.travis.yml4
-rw-r--r--core/blockchain.go2
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
--- a/.ci/DEXON-7548b3622930.json.enc
+++ b/.ci/DEXON-7548b3622930.json.enc
Binary files differ
diff --git a/.travis.yml b/.travis.yml
index 18a1dd476..363937b19 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 ea1d06489..8bbf6e809 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1891,7 +1891,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())
}