Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update go module versions #1646

Merged
merged 7 commits into from
Nov 30, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Next Next commit
chore: update go module versions
  • Loading branch information
ryanchristo committed Nov 29, 2022
commit 5bd4f1d9194212932b928231e43a60bd5654f50a
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ docs-build:
@cd docs && yarn && yarn build

godocs:
@echo "Wait a few seconds and then visit http://localhost:6060/pkg/github.com/regen-network/regen-ledger/v4/"
@echo "Wait a few seconds and then visit http://localhost:6060/pkg/github.com/regen-network/regen-ledger/v5/"
godoc -http=:6060

.PHONY: docs-dev docs-build godocs
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<a href="https://github.com/regen-network/regen-ledger/releases/latest">
<img alt="Version" src="https://img.shields.io/github/tag/regen-network/regen-ledger" />
</a>
<a href="https://pkg.go.dev/github.com/regen-network/regen-ledger/v4">
<img alt="Go Doc" src="https://pkg.go.dev/badge/github.com/regen-network/regen-ledger/v4" />
<a href="https://pkg.go.dev/github.com/regen-network/regen-ledger/v5">
<img alt="Go Doc" src="https://pkg.go.dev/badge/github.com/regen-network/regen-ledger/v5" />
</a>
</div>
<br />
Expand Down
16 changes: 8 additions & 8 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
ibcfee "github.com/cosmos/ibc-go/v5/modules/apps/29-fee"
ibcfeekeeper "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/keeper"
ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types"
"github.com/regen-network/regen-ledger/x/data/v2"

"github.com/regen-network/regen-ledger/x/intertx"
intertxkeeper "github.com/regen-network/regen-ledger/x/intertx/keeper"
Expand Down Expand Up @@ -115,16 +116,15 @@ import (
ibchost "github.com/cosmos/ibc-go/v5/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v5/modules/core/keeper"

regenupgrades "github.com/regen-network/regen-ledger/v4/app/upgrades"
v5 "github.com/regen-network/regen-ledger/v4/app/upgrades/v5"
"github.com/regen-network/regen-ledger/x/data"
datamodule "github.com/regen-network/regen-ledger/x/data/module"
"github.com/regen-network/regen-ledger/x/ecocredit"
baskettypes "github.com/regen-network/regen-ledger/x/ecocredit/basket"
ecocreditmodule "github.com/regen-network/regen-ledger/x/ecocredit/module"
regenupgrades "github.com/regen-network/regen-ledger/v5/app/upgrades"
v5 "github.com/regen-network/regen-ledger/v5/app/upgrades/v5"
datamodule "github.com/regen-network/regen-ledger/x/data/v2/module"
"github.com/regen-network/regen-ledger/x/ecocredit/v3"
baskettypes "github.com/regen-network/regen-ledger/x/ecocredit/v3/basket"
ecocreditmodule "github.com/regen-network/regen-ledger/x/ecocredit/v3/module"

// unnamed import of statik for swagger UI support
_ "github.com/regen-network/regen-ledger/v4/app/client/docs/statik"
_ "github.com/regen-network/regen-ledger/v5/app/client/docs/statik"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions app/client/cli/cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/server/cmd"

"github.com/regen-network/regen-ledger/v4/app"
"github.com/regen-network/regen-ledger/v4/app/client/cli"
"github.com/regen-network/regen-ledger/v5/app"
"github.com/regen-network/regen-ledger/v5/app/client/cli"
)

func TestInitCmd(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion app/client/cli/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
tmcli "github.com/tendermint/tendermint/libs/cli"
"github.com/tendermint/tendermint/libs/log"

"github.com/regen-network/regen-ledger/v4/app"
"github.com/regen-network/regen-ledger/v5/app"
)

// NewRootCmd creates a new root command for regen. It is called once in the
Expand Down
2 changes: 1 addition & 1 deletion app/client/cli/testnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/regen-network/regen-ledger/types/testutil/network"
"github.com/regen-network/regen-ledger/v4/app/testsuite"
"github.com/regen-network/regen-ledger/v5/app/testsuite"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion app/simulation/app_after_import_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/simulation"

regen "github.com/regen-network/regen-ledger/v4/app"
regen "github.com/regen-network/regen-ledger/v5/app"
)

func TestAppAfterImport(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion app/simulation/app_determinism_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/cosmos/cosmos-sdk/simapp/helpers"

regen "github.com/regen-network/regen-ledger/v4/app"
regen "github.com/regen-network/regen-ledger/v5/app"
)

func TestAppDeterminism(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions app/simulation/app_import_export_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
ibctransfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
ibchost "github.com/cosmos/ibc-go/v5/modules/core/24-host"

regen "github.com/regen-network/regen-ledger/v4/app"
"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/ecocredit"
regen "github.com/regen-network/regen-ledger/v5/app"
"github.com/regen-network/regen-ledger/x/data/v2"
"github.com/regen-network/regen-ledger/x/ecocredit/v3"
)

func TestAppImportExport(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion app/simulation/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/cosmos/cosmos-sdk/simapp"

regen "github.com/regen-network/regen-ledger/v4/app"
regen "github.com/regen-network/regen-ledger/v5/app"
)

func TestApp(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion app/simulation/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
storetypes "github.com/cosmos/cosmos-sdk/store/types"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/simulation"
regen "github.com/regen-network/regen-ledger/v4/app"
regen "github.com/regen-network/regen-ledger/v5/app"
)

// Get flags every time the simulator is run
Expand Down
2 changes: 1 addition & 1 deletion app/testsuite/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/tendermint/tendermint/libs/log"

"github.com/regen-network/regen-ledger/v4/app"
"github.com/regen-network/regen-ledger/v5/app"
)

func TestSimAppExportAndBlockedAddrs(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion app/testsuite/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/regen-network/regen-ledger/v4/app"
"github.com/regen-network/regen-ledger/v5/app"
)

// DefaultConsensusParams defines the default Tendermint consensus params used in
Expand Down
4 changes: 2 additions & 2 deletions app/testsuite/modules_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/stretchr/testify/suite"

data "github.com/regen-network/regen-ledger/x/data/client/testsuite"
ecocredit "github.com/regen-network/regen-ledger/x/ecocredit/client/testsuite"
data "github.com/regen-network/regen-ledger/x/data/v2/client/testsuite"
ecocredit "github.com/regen-network/regen-ledger/x/ecocredit/v3/client/testsuite"
)

func TestDataIntegration(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion app/testsuite/network_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"

"github.com/regen-network/regen-ledger/types/testutil/network"
"github.com/regen-network/regen-ledger/v4/app"
"github.com/regen-network/regen-ledger/v5/app"
)

func NewRegenAppConstructor(encCfg app.EncodingConfig) network.AppConstructor {
Expand Down
2 changes: 1 addition & 1 deletion app/testsuite/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
tmtypes "github.com/tendermint/tendermint/proto/tendermint/types"

"github.com/regen-network/regen-ledger/v4/app"
"github.com/regen-network/regen-ledger/v5/app"
)

type UpgradeTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v5/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types"

"github.com/regen-network/regen-ledger/v4/app/upgrades"
"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/ecocredit"
"github.com/regen-network/regen-ledger/v5/app/upgrades"
"github.com/regen-network/regen-ledger/x/data/v2"
"github.com/regen-network/regen-ledger/x/ecocredit/v3"
)

const Name = "v5"
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v5/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
abci "github.com/tendermint/tendermint/abci/types"

"github.com/regen-network/regen-ledger/v4/app/testsuite"
"github.com/regen-network/regen-ledger/x/ecocredit"
ecocreditv1 "github.com/regen-network/regen-ledger/x/ecocredit/base/types/v1"
"github.com/regen-network/regen-ledger/v5/app/testsuite"
"github.com/regen-network/regen-ledger/x/ecocredit/v3"
ecocreditv1 "github.com/regen-network/regen-ledger/x/ecocredit/v3/base/types/v1"
)

type UpgradeTestSuite struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/regen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cosmos/cosmos-sdk/server"
"github.com/cosmos/cosmos-sdk/server/cmd"

"github.com/regen-network/regen-ledger/v4/app"
"github.com/regen-network/regen-ledger/v4/app/client/cli"
"github.com/regen-network/regen-ledger/v5/app"
"github.com/regen-network/regen-ledger/v5/app/client/cli"
)

func main() {
Expand Down
11 changes: 5 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/regen-network/regen-ledger/v4
module github.com/regen-network/regen-ledger/v5

go 1.18

Expand All @@ -9,16 +9,15 @@ require (
github.com/gorilla/mux v1.8.0
github.com/rakyll/statik v0.1.7
github.com/regen-network/regen-ledger/types v1.0.0
github.com/regen-network/regen-ledger/x/data v0.0.0-20210602121340-fa967f821a6e
github.com/regen-network/regen-ledger/x/ecocredit v1.1.0
github.com/regen-network/regen-ledger/x/data/v2 v2.0.0
github.com/regen-network/regen-ledger/x/ecocredit/v3 v3.0.0
github.com/regen-network/regen-ledger/x/intertx v0.0.0-00010101000000-000000000000
github.com/rs/zerolog v1.28.0
github.com/spf13/cast v1.5.0
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.1
github.com/tendermint/tendermint v0.34.24
github.com/tendermint/tm-db v0.6.7

)

require (
Expand Down Expand Up @@ -173,9 +172,9 @@ replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alp

replace github.com/regen-network/regen-ledger/types => ./types

replace github.com/regen-network/regen-ledger/x/data => ./x/data
replace github.com/regen-network/regen-ledger/x/data/v2 => ./x/data

replace github.com/regen-network/regen-ledger/x/ecocredit => ./x/ecocredit
replace github.com/regen-network/regen-ledger/x/ecocredit/v3 => ./x/ecocredit

replace github.com/regen-network/regen-ledger/x/intertx => ./x/intertx

Expand Down
2 changes: 1 addition & 1 deletion proto/regen/ecocredit/basket/v1/state.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "cosmos/orm/v1/orm.proto";
import "google/protobuf/timestamp.proto";
import "regen/ecocredit/basket/v1/types.proto";

option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/basket/types/v1";
option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/v3/basket/types/v1";

// Basket represents a basket in state.
message Basket {
Expand Down
2 changes: 1 addition & 1 deletion proto/regen/ecocredit/marketplace/v1/events.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package regen.ecocredit.marketplace.v1;

option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/marketplace/types/v1";
option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/v3/marketplace/types/v1";

// EventSell is an event emitted when a sell order is created.
message EventSell {
Expand Down
2 changes: 1 addition & 1 deletion proto/regen/ecocredit/marketplace/v1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "google/api/annotations.proto";
import "google/protobuf/timestamp.proto";
import "regen/ecocredit/marketplace/v1/state.proto";

option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/marketplace/types/v1";
option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/v3/marketplace/types/v1";

// Msg is the regen.ecocredit.marketplace.v1 Query service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/regen/ecocredit/marketplace/v1/state.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package regen.ecocredit.marketplace.v1;
import "cosmos/orm/v1/orm.proto";
import "google/protobuf/timestamp.proto";

option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/marketplace/types/v1";
option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/v3/marketplace/types/v1";

// SellOrder represents the information for a sell order.
message SellOrder {
Expand Down
2 changes: 1 addition & 1 deletion proto/regen/ecocredit/marketplace/v1/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "cosmos/msg/v1/msg.proto";
import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto";

option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/marketplace/types/v1";
option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/v3/marketplace/types/v1";

// Msg is the regen.ecocredit.marketplace.v1 Msg service.
service Msg {
Expand Down
2 changes: 1 addition & 1 deletion proto/regen/ecocredit/marketplace/v1/types.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package regen.ecocredit.marketplace.v1;
import "gogoproto/gogo.proto";
import "regen/ecocredit/marketplace/v1/state.proto";

option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/marketplace/types/v1";
option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/v3/marketplace/types/v1";

// AllowDenomProposal is a gov Content type for approving a denom for use in the
// marketplace.
Expand Down
2 changes: 1 addition & 1 deletion proto/regen/ecocredit/orderbook/v1alpha1/memory.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package regen.ecocredit.orderbook.v1alpha1;
import "cosmos/orm/v1/orm.proto";
import "google/protobuf/timestamp.proto";

option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/orderbook";
option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/v3/orderbook";

// BuyOrderSellOrderMatch defines the data the FIFO/price-time-priority matching
// algorithm used to actually match buy and sell orders.
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_cli_docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/spf13/cobra/doc"

"github.com/regen-network/regen-ledger/v4/app/client/cli"
"github.com/regen-network/regen-ledger/v5/app/client/cli"
)

// generate documentation for all regen app commands
Expand Down
2 changes: 1 addition & 1 deletion x/data/client/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"

"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/data/v2"
)

// QueryCmd returns the parent command for all x/data query commands.
Expand Down
2 changes: 1 addition & 1 deletion x/data/client/testsuite/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/testutil/rest"
"github.com/cosmos/cosmos-sdk/types/query"

"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/data/v2"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions x/data/client/testsuite/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/cosmos/cosmos-sdk/testutil"

"github.com/regen-network/regen-ledger/types/testutil/cli"
"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/data/client"
"github.com/regen-network/regen-ledger/x/data/v2"
"github.com/regen-network/regen-ledger/x/data/v2/client"
)

const outputFormat = "JSON"
Expand Down
4 changes: 2 additions & 2 deletions x/data/client/testsuite/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (

"github.com/regen-network/regen-ledger/types/testutil/cli"
"github.com/regen-network/regen-ledger/types/testutil/network"
"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/data/client"
"github.com/regen-network/regen-ledger/x/data/v2"
"github.com/regen-network/regen-ledger/x/data/v2/client"
)

type IntegrationTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion x/data/client/testsuite/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package testsuite
import (
"crypto"

"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/data/v2"
)

func (s *IntegrationTestSuite) createIRIAndGraphHash(content []byte) (string, *data.ContentHash) {
Expand Down
2 changes: 1 addition & 1 deletion x/data/client/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/tx"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/data/v2"
)

// TxCmd returns a root CLI command handler for all x/data transaction commands.
Expand Down
2 changes: 1 addition & 1 deletion x/data/client/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/cosmos/cosmos-sdk/client"

"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/data/v2"
)

func formatExample(str string) string {
Expand Down
2 changes: 1 addition & 1 deletion x/data/genesis/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

api "github.com/regen-network/regen-ledger/api/regen/data/v1"
"github.com/regen-network/regen-ledger/types/ormutil"
"github.com/regen-network/regen-ledger/x/data"
"github.com/regen-network/regen-ledger/x/data/v2"
)

// ValidateGenesis performs basic validation of genesis state.
Expand Down
Loading