Skip to content

Commit 549c181

Browse files
authored
chore: restructuring 07-tendermint lightclient directory layout (#1677)
* restructuring 07-tendermint lightclient directory tree * adding changelog entry * chore: restructuring 06-solomachine lightclient directory layout (#1679) * restructing 06-solomachine folder layout * tidy go modules * fixing dead link * adding changelog entry
1 parent 60e5305 commit 549c181

File tree

87 files changed

+876
-885
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+876
-885
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
4343
### API Breaking
4444

4545
* (transfer) [\#1250](https://github.com/cosmos/ibc-go/pull/1250) Deprecate `GetTransferAccount` since the `transfer` module account is never used.
46+
* (06-solomachine) [\#1679](https://github.com/cosmos/ibc-go/pull/1679) Remove `types` sub-package from `06-solomachine` lightclient directory.
47+
* (07-tendermint) [\#1677](https://github.com/cosmos/ibc-go/pull/1677) Remove `types` sub-package from `07-tendermint` lightclient directory.
4648

4749
### State Machine Breaking
4850

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alp
77
require (
88
github.com/armon/go-metrics v0.3.10
99
github.com/confio/ics23/go v0.7.0
10-
github.com/cosmos/cosmos-sdk v0.45.3
10+
github.com/cosmos/cosmos-sdk v0.45.4
1111
github.com/gogo/protobuf v1.3.3
1212
github.com/golang/protobuf v1.5.2
1313
github.com/gorilla/mux v1.8.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc
229229
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
230230
github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44=
231231
github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU=
232-
github.com/cosmos/cosmos-sdk v0.45.3 h1:PiVSU3IkNEDPhoxOZHk2lPnhwBBJgEYAtAR0jGXRN4g=
233-
github.com/cosmos/cosmos-sdk v0.45.3/go.mod h1:qYm5JEr0ZlbnmoP/Q3b+dYMOliHf4ddHirpILiwZzqg=
232+
github.com/cosmos/cosmos-sdk v0.45.4 h1:eStDAhJdMY8n5arbBRe+OwpNeBSunxSBHp1g55ulfdA=
233+
github.com/cosmos/cosmos-sdk v0.45.4/go.mod h1:WOqtDxN3eCCmnYLVla10xG7lEXkFjpTaqm2a2WasgCc=
234234
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
235235
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
236236
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=

modules/core/02-client/abci.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

66
"github.com/cosmos/ibc-go/v3/modules/core/02-client/keeper"
7-
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
7+
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint"
88
)
99

1010
// BeginBlocker is used to perform IBC client upgrades

modules/core/02-client/abci_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
1111
client "github.com/cosmos/ibc-go/v3/modules/core/02-client"
1212
"github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
13-
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
13+
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint"
1414
ibctesting "github.com/cosmos/ibc-go/v3/testing"
1515
)
1616

modules/core/02-client/client/utils/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
host "github.com/cosmos/ibc-go/v3/modules/core/24-host"
1414
ibcclient "github.com/cosmos/ibc-go/v3/modules/core/client"
1515
"github.com/cosmos/ibc-go/v3/modules/core/exported"
16-
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
16+
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint"
1717
)
1818

1919
// QueryClientState returns a client state. If prove is true, it performs an ABCI store query

modules/core/02-client/keeper/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
1212
commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types"
1313
"github.com/cosmos/ibc-go/v3/modules/core/exported"
14-
solomachinetypes "github.com/cosmos/ibc-go/v3/modules/light-clients/06-solomachine/types"
15-
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
14+
solomachinetypes "github.com/cosmos/ibc-go/v3/modules/light-clients/06-solomachine"
15+
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint"
1616
ibctesting "github.com/cosmos/ibc-go/v3/testing"
1717
)
1818

modules/core/02-client/keeper/grpc_query_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
1414
commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types"
1515
"github.com/cosmos/ibc-go/v3/modules/core/exported"
16-
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
16+
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint"
1717
ibctesting "github.com/cosmos/ibc-go/v3/testing"
1818
)
1919

modules/core/02-client/keeper/keeper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types"
1919
host "github.com/cosmos/ibc-go/v3/modules/core/24-host"
2020
"github.com/cosmos/ibc-go/v3/modules/core/exported"
21-
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
21+
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint"
2222
)
2323

2424
// Keeper represents a type that grants read and write permissions to any client

modules/core/02-client/keeper/keeper_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
2020
commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types"
2121
"github.com/cosmos/ibc-go/v3/modules/core/exported"
22-
solomachinetypes "github.com/cosmos/ibc-go/v3/modules/light-clients/06-solomachine/types"
23-
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
22+
solomachinetypes "github.com/cosmos/ibc-go/v3/modules/light-clients/06-solomachine"
23+
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint"
2424
ibctesting "github.com/cosmos/ibc-go/v3/testing"
2525
ibctestingmock "github.com/cosmos/ibc-go/v3/testing/mock"
2626
"github.com/cosmos/ibc-go/v3/testing/simapp"

0 commit comments

Comments
 (0)