Commit ea925a94 authored by king wang's avatar king wang

fix test

parent 44934b41
CHAIN33=gitlab.33.cn/chain33/chain33 CHAIN33=gitlab.33.cn/chain33/chain33
MKPATH=$(abspath $(lastword $(MAKEFILE_LIST))) MKPATH=$(abspath $(lastword $(MAKEFILE_LIST)))
MKDIR=$(dir $(MKPATH)) MKDIR=$(dir $(MKPATH))
PKG_LIST := `go list ./... | grep -v "vendor" | grep -v "chain33/test" | grep -v "mocks" | grep -v "pbft"`
all: build all: build
...@@ -34,3 +35,7 @@ clean: ...@@ -34,3 +35,7 @@ clean:
@rm -rf plugin/dapp/init @rm -rf plugin/dapp/init
@rm -rf plugin/crypto/init @rm -rf plugin/crypto/init
@rm -rf plugin/store/init @rm -rf plugin/store/init
test: ## Run unittests
@go test -race $(PKG_LIST)
File deleted
...@@ -387,7 +387,7 @@ func (b *btcdClient) GetBlockHeader(height uint64) (*ty.BtcHeader, error) { ...@@ -387,7 +387,7 @@ func (b *btcdClient) GetBlockHeader(height uint64) (*ty.BtcHeader, error) {
h := &ty.BtcHeader{ h := &ty.BtcHeader{
Hash: header.Hash, Hash: header.Hash,
Confirmations: header.Confirmations, Confirmations: uint64(header.Confirmations),
Height: uint64(header.Height), Height: uint64(header.Height),
MerkleRoot: header.MerkleRoot, MerkleRoot: header.MerkleRoot,
Time: header.Time, Time: header.Time,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment