From 09f0d26bea6598847a323607cc32f2c42317d5f5 Mon Sep 17 00:00:00 2001 From: MengXiangJian <805442788@qq.com> Date: Sat, 30 May 2020 09:57:38 +0800 Subject: [PATCH] Merge PR: update go.mod and update target testnet in Makefile (#180) Co-authored-by: meng --- Makefile | 4 ++-- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 24ff8644a6..4ec1a717c7 100644 --- a/Makefile +++ b/Makefile @@ -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/... diff --git a/go.mod b/go.mod index a5b78fb9f3..e3c9402ad4 100644 --- a/go.mod +++ b/go.mod @@ -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 ) diff --git a/go.sum b/go.sum index 0b0ae3e952..4658d55d31 100644 --- a/go.sum +++ b/go.sum @@ -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=