Skip to content

Commit 34fbdda

Browse files
fazafaza
committed
Upgrade to gitopia version v6
1 parent 1d059cf commit 34fbdda

File tree

7 files changed

+24
-16
lines changed

7 files changed

+24
-16
lines changed

‎cmd/git-gitopia/lfs/init.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/gitopia/git-remote-gitopia/config"
1515
"github.com/gitopia/git-remote-gitopia/core"
1616
"github.com/gitopia/git-remote-gitopia/core/api"
17-
gitopiatypes "github.com/gitopia/gitopia/v5/x/gitopia/types"
17+
gitopiatypes "github.com/gitopia/gitopia/v6/x/gitopia/types"
1818
"github.com/pkg/errors"
1919
"github.com/spf13/cobra"
2020
"google.golang.org/grpc"

‎cmd/git-remote-gitopia/gitopia.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
core "github.com/gitopia/git-remote-gitopia/core"
2121
"github.com/gitopia/git-remote-gitopia/core/api"
2222
"github.com/gitopia/git-remote-gitopia/core/wallet"
23-
gitopiatypes "github.com/gitopia/gitopia/v5/x/gitopia/types"
24-
"github.com/gitopia/gitopia/v5/x/gitopia/utils"
23+
gitopiatypes "github.com/gitopia/gitopia/v6/x/gitopia/types"
24+
"github.com/gitopia/gitopia/v6/x/gitopia/utils"
2525
"github.com/go-git/go-git/v5/plumbing"
2626
"github.com/pkg/errors"
2727
"google.golang.org/grpc"
@@ -93,7 +93,7 @@ func (h *GitopiaHandler) Initialize(remote *core.Remote) error {
9393
RepositoryName: h.remoteRepositoryName,
9494
})
9595
if err != nil {
96-
return err
96+
return errors.Wrap(err, fmt.Sprintf("error getting repository %s/%s", h.remoteUserId, h.remoteRepositoryName))
9797
}
9898

9999
h.remoteRepository = *res.Repository

‎core/wallet/gitopia_wallet.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
2525
"github.com/cosmos/cosmos-sdk/x/feegrant"
2626
"github.com/gitopia/git-remote-gitopia/config"
27-
gitopia "github.com/gitopia/gitopia/v5/app"
28-
offchaintypes "github.com/gitopia/gitopia/v5/x/offchain/types"
27+
gitopia "github.com/gitopia/gitopia/v6/app"
28+
offchaintypes "github.com/gitopia/gitopia/v6/x/offchain/types"
2929
"github.com/pkg/errors"
3030
"google.golang.org/grpc"
3131
)

‎core/wallet/ledger.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
2525
"github.com/cosmos/cosmos-sdk/x/feegrant"
2626
"github.com/gitopia/git-remote-gitopia/config"
27-
gitopia "github.com/gitopia/gitopia/v5/app"
28-
offchaintypes "github.com/gitopia/gitopia/v5/x/offchain/types"
27+
gitopia "github.com/gitopia/gitopia/v6/app"
28+
offchaintypes "github.com/gitopia/gitopia/v6/x/offchain/types"
2929
"github.com/pkg/errors"
3030
"google.golang.org/grpc"
3131
)

‎core/wallet/os_keyring.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/gitopia/git-remote-gitopia/config"
1919
glib "github.com/gitopia/gitopia-go"
2020
"github.com/gitopia/gitopia-go/logger"
21-
gitopia "github.com/gitopia/gitopia/v5/app"
22-
offchaintypes "github.com/gitopia/gitopia/v5/x/offchain/types"
21+
gitopia "github.com/gitopia/gitopia/v6/app"
22+
offchaintypes "github.com/gitopia/gitopia/v6/x/offchain/types"
2323
goGitConfig "github.com/go-git/go-git/v5/config"
2424
"github.com/pkg/errors"
2525
"github.com/sirupsen/logrus"

‎go.mod‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.21
55
require (
66
github.com/cometbft/cometbft v0.37.6
77
github.com/cosmos/cosmos-sdk v0.47.13
8-
github.com/gitopia/gitopia-go v0.6.2
9-
github.com/gitopia/gitopia/v5 v5.1.0
8+
github.com/gitopia/gitopia-go v0.7.0-rc.3
9+
github.com/gitopia/gitopia/v6 v6.0.0-rc.6
1010
github.com/go-git/go-git/v5 v5.11.0
1111
github.com/pkg/errors v0.9.1
1212
github.com/sirupsen/logrus v1.9.3
@@ -119,6 +119,7 @@ require (
119119
github.com/hashicorp/hcl v1.0.0 // indirect
120120
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
121121
github.com/huandu/skiplist v1.2.0 // indirect
122+
github.com/iden3/go-iden3-crypto v0.0.16 // indirect
122123
github.com/improbable-eng/grpc-web v0.15.0 // indirect
123124
github.com/inconshreveable/mousetrap v1.1.0 // indirect
124125
github.com/ipfs/go-cid v0.3.2 // indirect
@@ -181,6 +182,7 @@ require (
181182
github.com/tendermint/go-amino v0.16.0 // indirect
182183
github.com/tidwall/btree v1.6.0 // indirect
183184
github.com/ulikunitz/xz v0.5.11 // indirect
185+
github.com/wealdtech/go-merkletree/v2 v2.6.1 // indirect
184186
github.com/xanzy/ssh-agent v0.3.3 // indirect
185187
github.com/zondax/hid v0.9.2 // indirect
186188
github.com/zondax/ledger-go v0.14.3 // indirect

‎go.sum‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,10 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
448448
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
449449
github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
450450
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
451-
github.com/gitopia/gitopia-go v0.6.2 h1:3Xu090ObJ8TP5FqmRj/blRSX0721ootXojwuOJLHb6Y=
452-
github.com/gitopia/gitopia-go v0.6.2/go.mod h1:UueURx6CKcAl95Y+ldqX1k41TlfjM8fRuBCUNanW6TY=
453-
github.com/gitopia/gitopia/v5 v5.1.0 h1:a/RySnjfpRYJwbkqW76QFmkBW/FihLDJHEpCtbF85Zg=
454-
github.com/gitopia/gitopia/v5 v5.1.0/go.mod h1:t1FjB6j0LlGB2Ka1+Hu+XiARQ4NHhoVx9uKiR8+yhwc=
451+
github.com/gitopia/gitopia-go v0.7.0-rc.3 h1:UqNPz46GKFsiJW7C7icdoMZZ3RqavuuBXVPxsdLIVKk=
452+
github.com/gitopia/gitopia-go v0.7.0-rc.3/go.mod h1:p6i+BP3FV6FCcMsPDKJfYCRBqFWhspVoVhgz1MGVIMs=
453+
github.com/gitopia/gitopia/v6 v6.0.0-rc.6 h1:z64t9EkTxuQ4SuoE0O8Zi/NGLVV5lAP0JDGwsqfeCqs=
454+
github.com/gitopia/gitopia/v6 v6.0.0-rc.6/go.mod h1:HujUCHweDG8AoLctQPt8L7EtL+Eu7L1KpyjVqGVEDr8=
455455
github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
456456
github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
457457
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
@@ -706,6 +706,8 @@ github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXM
706706
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
707707
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
708708
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
709+
github.com/iden3/go-iden3-crypto v0.0.16 h1:zN867xiz6HgErXVIV/6WyteGcOukE9gybYTorBMEdsk=
710+
github.com/iden3/go-iden3-crypto v0.0.16/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
709711
github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ=
710712
github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8=
711713
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -763,6 +765,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
763765
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
764766
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
765767
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
768+
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
769+
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
766770
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
767771
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
768772
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
@@ -1059,6 +1063,8 @@ github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
10591063
github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
10601064
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
10611065
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
1066+
github.com/wealdtech/go-merkletree/v2 v2.6.1 h1:EKrzJep7JXHk1bYQAHtEcBvScqW1xgI86aF5y6iPAm0=
1067+
github.com/wealdtech/go-merkletree/v2 v2.6.1/go.mod h1:Ooz0/mhs/XF1iYfbowRawrkAI56YYZ+oUl5Dw2Tlnjk=
10621068
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
10631069
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
10641070
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=

0 commit comments

Comments
 (0)