Skip to content

Commit

Permalink
Merge PR: update go.mod and update target testnet in Makefile (#180)
Browse files Browse the repository at this point in the history
Co-authored-by: meng <meng@mengs-MacBook-Pro.local>
  • Loading branch information
xiangjianmeng and meng authored May 30, 2020
1 parent 915570d commit 09f0d26
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ okchain:
go install -v $(BUILD_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/okchaincli

testnet:
env GO111MODULE=off go install -v $(BUILD_TESTNET_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/okchaind
env GO111MODULE=off go install -v $(BUILD_TESTNET_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/okchaincli
go install -v $(BUILD_TESTNET_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/okchaind
go install -v $(BUILD_TESTNET_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/okchaincli

test-unit:
@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' ./app/...
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ require (
)

replace (
github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.37.9-okchain6
github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.37.9-testnet
github.com/tendermint/iavl => github.com/okex/iavl v0.12.4-okchain
github.com/tendermint/tendermint => github.com/okex/tendermint v0.32.10-okchain1
)
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/okex/cosmos-sdk v0.37.9-okchain6 h1:4EzAhX+6Ouup7sRJZ4hj6wibCbgrcYte8Ym322pN/oo=
github.com/okex/cosmos-sdk v0.37.9-okchain6/go.mod h1:HjW0+Q5rWWm+4CaK8f5CIN/xf38vkPA2xue1PB5Nk3A=
github.com/okex/cosmos-sdk v0.37.9-testnet h1:2PKu+F0R2Cln0LUHdEeKBMEMo1c4RfKwnt6fbP9lbx8=
github.com/okex/cosmos-sdk v0.37.9-testnet/go.mod h1:HjW0+Q5rWWm+4CaK8f5CIN/xf38vkPA2xue1PB5Nk3A=
github.com/okex/iavl v0.12.4-okchain h1:BAFmygzhx6k4KGnLrY87ZrJvRSb+wf8Oo4e2KhUwXcU=
github.com/okex/iavl v0.12.4-okchain/go.mod h1:8LHakzt8/0G3/I8FUU0ReNx98S/EP6eyPJkAUvEXT/o=
github.com/okex/tendermint v0.32.10-okchain1 h1:mEsl6YGb7mCkJaXZxnIZO6/jmF947X39wFa4oI8gKgE=
Expand Down

0 comments on commit 09f0d26

Please sign in to comment.