openatom_foundation
/
bitxhub
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into fix/storage

This commit is contained in:
Treaser(Song) Lou 2020-10-20 20:29:20 +08:00 committed by GitHub
parent 65b922b57c a31b66c1b3
commit bd0a38d96e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -47,15 +47,15 @@ tester:
cd tester && $(GO) test -v -run TestTester
## make install: Go install the project
install:
install:mod
cd internal/repo && packr
$(GO) install -tags '${TAGS}' -ldflags '${GOLDFLAGS}' ./cmd/${APP_NAME}
$(GO) install -tags '${TAGS}' -ldflags '${GOLDFLAGS}' -modfile go${TAGS}.mod ./cmd/${APP_NAME}
@printf "${GREEN}Build bitxhub successfully!${NC}\n"
build:
build: mod
cd internal/repo && packr
@mkdir -p bin
$(GO) build -tags '${TAGS}' -ldflags '${GOLDFLAGS}' ./cmd/${APP_NAME}
$(GO) build -tags '${TAGS}' -ldflags '${GOLDFLAGS}' -modfile go${TAGS}.mod ./cmd/${APP_NAME}
@mv ./bitxhub bin
@printf "${GREEN}Build bitxhub successfully!${NC}\n"
@ -63,6 +63,9 @@ build:
linter:
golangci-lint run
mod:
@if [ "${TAGS}" != "" ]; then MODS=$(cat ${TAGS}.diff); sed "s?)?${MODS})?" go.mod > go${TAGS}.mod; fi
## make cluster: Run cluster including 4 nodes
cluster:install
@cd scripts && bash cluster.sh

1
ent.diff Normal file
View File

@ -0,0 +1 @@
github.com/bitxhub/parallel-executor v0.0.0-20201016032030-f593c9959d5e

4
go.sum
View File

@ -569,10 +569,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
github.com/meshplus/bitxhub v1.0.0-rc2/go.mod h1:ijWzPl7GExD3IKXJ0LhV4q680kDy1IFQKd2Kzyzmtl0=
github.com/meshplus/bitxhub-core v0.1.0-rc1 h1:i8/8Ay7McOdgAdeZIMeXRzMSzM0usN+hnkGVyIfrOtU=
github.com/meshplus/bitxhub-core v0.1.0-rc1/go.mod h1:ayq95vbGEh/G2nKyPeXPc62zanWhDuusVpIDAHm4Rk0=
github.com/meshplus/bitxhub-core v0.1.0-rc1.0.20201015134923-e66aacac2ab8 h1:jB7m0c9ZEjDj40uhBCX9GUdeX4uY+j66Pt3658VqCD0=
github.com/meshplus/bitxhub-core v0.1.0-rc1.0.20201015134923-e66aacac2ab8/go.mod h1:z60hNhn5jgGgQiUOE0AKK2vM3WKQfekhljHjDI5j/Nw=
github.com/meshplus/bitxhub-core v0.1.0-rc1.0.20201015142741-b1a2fda8f0bd h1:bWYPw0N75xWF8h66lYilqRbnZ0YKTw+8xh/1TK7BhQk=
github.com/meshplus/bitxhub-core v0.1.0-rc1.0.20201015142741-b1a2fda8f0bd/go.mod h1:z60hNhn5jgGgQiUOE0AKK2vM3WKQfekhljHjDI5j/Nw=
github.com/meshplus/bitxhub-core v0.1.0-rc1.0.20201016031620-9d2d859c4069 h1:tAKmTgR/I4JbQcrP9I+dFtApQdWc9e7dzG0NqDd65fg=
github.com/meshplus/bitxhub-core v0.1.0-rc1.0.20201016031620-9d2d859c4069/go.mod h1:z60hNhn5jgGgQiUOE0AKK2vM3WKQfekhljHjDI5j/Nw=
github.com/meshplus/bitxhub-kit v1.0.0-rc1/go.mod h1:ra/AhOkPvpElI+wXrB9G6DjdcrdxFU3vMwA5MYKr9D0=

2
pkg/imports/imports.go → imports/imports.go
View File

@ -1,4 +1,4 @@
// +build com
// +build ent
package imports

0
pkg/imports/place.go → imports/place.go
View File

2
internal/app/bitxhub.go
View File

@ -10,6 +10,7 @@ import (
"github.com/ethereum/go-ethereum/common/fdlimit"
"github.com/meshplus/bitxhub-kit/storage/leveldb"
"github.com/meshplus/bitxhub-kit/types"
_ "github.com/meshplus/bitxhub/imports"
"github.com/meshplus/bitxhub/internal/executor"
"github.com/meshplus/bitxhub/internal/ledger"
"github.com/meshplus/bitxhub/internal/ledger/genesis"
@ -18,7 +19,6 @@ import (
"github.com/meshplus/bitxhub/internal/repo"
"github.com/meshplus/bitxhub/internal/router"
"github.com/meshplus/bitxhub/internal/storages"
_ "github.com/meshplus/bitxhub/pkg/imports"
"github.com/meshplus/bitxhub/pkg/order"
"github.com/meshplus/bitxhub/pkg/order/etcdraft"
"github.com/meshplus/bitxhub/pkg/peermgr"