Skip to content

Refactor buf modules #4083

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor buf modules #4083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
- uses: actions/checkout@v4
- uses: bufbuild/buf-action@dfda68eacb65895184c76b9ae522b977636a2c47 #v1.1.4
with:
input: "proto"
Copy link
Contributor Author

@joshua-kim joshua-kim Jul 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upon making changes to our CI I think there was a miss and we need another github action to run the linter on the connect module as a follow-up to this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue: #4084

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way to not use a github action for a new linter? Ideally this one should go away in favor of a task that can be executed both locally and in CI.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm - I'm being dumb... our check-generate-protobuf nix task which is already in ci runs linting under the connectproto directory already (which also does run locally).

It's actually unclear to me what this CI step is for - since it doesn't push the buf schema and just runs the linter.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest removing then.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR: #4189

input: "buf/proto"
pr_comment: false
# Breaking changes are managed by the rpcchainvm protocol version.
breaking: false
Expand Down
2 changes: 1 addition & 1 deletion api/admin/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/ava-labs/avalanchego/vms"
"github.com/ava-labs/avalanchego/vms/registry"

rpcdbpb "github.com/ava-labs/avalanchego/proto/pb/rpcdb"
rpcdbpb "github.com/ava-labs/avalanchego/buf/proto/pb/rpcdb"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion api/admin/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/ava-labs/avalanchego/vms/registry/registrymock"
"github.com/ava-labs/avalanchego/vms/vmsmock"

rpcdbpb "github.com/ava-labs/avalanchego/proto/pb/rpcdb"
rpcdbpb "github.com/ava-labs/avalanchego/buf/proto/pb/rpcdb"
)

type loadVMsTest struct {
Expand Down
0 connectproto/buf.gen.yaml → buf/connect/buf.gen.yaml
View file
Open in desktop
File renamed without changes.
0 connectproto/buf.lock → buf/connect/buf.lock
View file
Open in desktop
File renamed without changes.
0 connectproto/buf.yaml → buf/connect/buf.yaml
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions connectproto/pb/xsvm/service.pb.go → buf/connect/pb/xsvm/service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...to/pb/xsvm/xsvmconnect/service.connect.go → ...ct/pb/xsvm/xsvmconnect/service.connect.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion connectproto/xsvm/service.proto → buf/connect/xsvm/service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package xsvm;

option go_package = "github.com/ava-labs/avalanchego/connectproto/pb/xsvm";
option go_package = "github.com/ava-labs/avalanchego/buf/connect/pb/xsvm";

service Ping {
rpc Ping(PingRequest) returns (PingReply);
Expand Down
0 proto/README.md → buf/proto/README.md
View file
Open in desktop
File renamed without changes.
0 proto/aliasreader/aliasreader.proto → buf/proto/aliasreader/aliasreader.proto
View file
Open in desktop
File renamed without changes.
0 proto/appsender/appsender.proto → buf/proto/appsender/appsender.proto
View file
Open in desktop
File renamed without changes.
0 proto/buf.gen.yaml → buf/proto/buf.gen.yaml
View file
Open in desktop
File renamed without changes.
0 proto/buf.lock → buf/proto/buf.lock
View file
Open in desktop
File renamed without changes.
0 proto/buf.md → buf/proto/buf.md
View file
Open in desktop
File renamed without changes.
0 proto/buf.yaml → buf/proto/buf.yaml
View file
Open in desktop
File renamed without changes.
0 proto/http/http.proto → buf/proto/http/http.proto
View file
Open in desktop
File renamed without changes.
0 .../http/responsewriter/responsewriter.proto → .../http/responsewriter/responsewriter.proto
View file
Open in desktop
File renamed without changes.
0 proto/io/reader/reader.proto → buf/proto/io/reader/reader.proto
View file
Open in desktop
File renamed without changes.
0 proto/io/writer/writer.proto → buf/proto/io/writer/writer.proto
View file
Open in desktop
File renamed without changes.
0 proto/net/conn/conn.proto → buf/proto/net/conn/conn.proto
View file
Open in desktop
File renamed without changes.
0 proto/p2p/p2p.proto → buf/proto/p2p/p2p.proto
View file
Open in desktop
File renamed without changes.
0 proto/pb/aliasreader/aliasreader.pb.go → buf/proto/pb/aliasreader/aliasreader.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/aliasreader/aliasreader_grpc.pb.go → ...oto/pb/aliasreader/aliasreader_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/appsender/appsender.pb.go → buf/proto/pb/appsender/appsender.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/appsender/appsender_grpc.pb.go → buf/proto/pb/appsender/appsender_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/http/http.pb.go → buf/proto/pb/http/http.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/http/http_grpc.pb.go → buf/proto/pb/http/http_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 .../http/responsewriter/responsewriter.pb.go → .../http/responsewriter/responsewriter.pb.go
View file
Open in desktop
File renamed without changes.
0 .../responsewriter/responsewriter_grpc.pb.go → .../responsewriter/responsewriter_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/io/reader/reader.pb.go → buf/proto/pb/io/reader/reader.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/io/reader/reader_grpc.pb.go → buf/proto/pb/io/reader/reader_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/io/writer/writer.pb.go → buf/proto/pb/io/writer/writer.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/io/writer/writer_grpc.pb.go → buf/proto/pb/io/writer/writer_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/net/conn/conn.pb.go → buf/proto/pb/net/conn/conn.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/net/conn/conn_grpc.pb.go → buf/proto/pb/net/conn/conn_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/p2p/p2p.pb.go → buf/proto/pb/p2p/p2p.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/platformvm/platformvm.pb.go → buf/proto/pb/platformvm/platformvm.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/rpcdb/rpcdb.pb.go → buf/proto/pb/rpcdb/rpcdb.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/rpcdb/rpcdb_grpc.pb.go → buf/proto/pb/rpcdb/rpcdb_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/sdk/sdk.pb.go → buf/proto/pb/sdk/sdk.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/sharedmemory/sharedmemory.pb.go → buf/proto/pb/sharedmemory/sharedmemory.pb.go
View file
Open in desktop
File renamed without changes.
0 ...o/pb/sharedmemory/sharedmemory_grpc.pb.go → ...o/pb/sharedmemory/sharedmemory_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/signer/signer.pb.go → buf/proto/pb/signer/signer.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/signer/signer_grpc.pb.go → buf/proto/pb/signer/signer_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/sync/sync.pb.go → buf/proto/pb/sync/sync.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/sync/sync_grpc.pb.go → buf/proto/pb/sync/sync_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 ...o/pb/validatorstate/validator_state.pb.go → ...o/pb/validatorstate/validator_state.pb.go
View file
Open in desktop
File renamed without changes.
0 ...validatorstate/validator_state_grpc.pb.go → ...validatorstate/validator_state_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/vm/runtime/runtime.pb.go → buf/proto/pb/vm/runtime/runtime.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/vm/runtime/runtime_grpc.pb.go → buf/proto/pb/vm/runtime/runtime_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/vm/vm.pb.go → buf/proto/pb/vm/vm.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/vm/vm_grpc.pb.go → buf/proto/pb/vm/vm_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/warp/message.pb.go → buf/proto/pb/warp/message.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/pb/warp/message_grpc.pb.go → buf/proto/pb/warp/message_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 proto/platformvm/platformvm.proto → buf/proto/platformvm/platformvm.proto
View file
Open in desktop
File renamed without changes.
0 proto/rpcdb/rpcdb.proto → buf/proto/rpcdb/rpcdb.proto
View file
Open in desktop
File renamed without changes.
0 proto/sdk/sdk.proto → buf/proto/sdk/sdk.proto
View file
Open in desktop
File renamed without changes.
0 proto/sharedmemory/sharedmemory.proto → buf/proto/sharedmemory/sharedmemory.proto
View file
Open in desktop
File renamed without changes.
0 proto/signer/signer.proto → buf/proto/signer/signer.proto
View file
Open in desktop
File renamed without changes.
0 proto/sync/sync.proto → buf/proto/sync/sync.proto
View file
Open in desktop
File renamed without changes.
0 proto/validatorstate/validator_state.proto → ...roto/validatorstate/validator_state.proto
View file
Open in desktop
File renamed without changes.
0 proto/vm/runtime/runtime.proto → buf/proto/vm/runtime/runtime.proto
View file
Open in desktop
File renamed without changes.
0 proto/vm/vm.proto → buf/proto/vm/vm.proto
View file
Open in desktop
File renamed without changes.
0 proto/warp/message.proto → buf/proto/warp/message.proto
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion chains/atomic/gsharedmemory/filtered_batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package gsharedmemory
import (
"github.com/ava-labs/avalanchego/utils/set"

sharedmemorypb "github.com/ava-labs/avalanchego/proto/pb/sharedmemory"
sharedmemorypb "github.com/ava-labs/avalanchego/buf/proto/pb/sharedmemory"
)

type filteredBatch struct {
Expand Down
2 changes: 1 addition & 1 deletion chains/atomic/gsharedmemory/shared_memory_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ava-labs/avalanchego/database"
"github.com/ava-labs/avalanchego/ids"

sharedmemorypb "github.com/ava-labs/avalanchego/proto/pb/sharedmemory"
sharedmemorypb "github.com/ava-labs/avalanchego/buf/proto/pb/sharedmemory"
)

var _ atomic.SharedMemory = (*Client)(nil)
Expand Down
2 changes: 1 addition & 1 deletion chains/atomic/gsharedmemory/shared_memory_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ava-labs/avalanchego/database"
"github.com/ava-labs/avalanchego/ids"

sharedmemorypb "github.com/ava-labs/avalanchego/proto/pb/sharedmemory"
sharedmemorypb "github.com/ava-labs/avalanchego/buf/proto/pb/sharedmemory"
)

var _ sharedmemorypb.SharedMemoryServer = (*Server)(nil)
Expand Down
2 changes: 1 addition & 1 deletion chains/atomic/gsharedmemory/shared_memory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils"

sharedmemorypb "github.com/ava-labs/avalanchego/proto/pb/sharedmemory"
sharedmemorypb "github.com/ava-labs/avalanchego/buf/proto/pb/sharedmemory"
)

func TestInterface(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion chains/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import (
"github.com/ava-labs/avalanchego/vms/secp256k1fx"
"github.com/ava-labs/avalanchego/vms/tracedvm"

p2ppb "github.com/ava-labs/avalanchego/proto/pb/p2p"
p2ppb "github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
smcon "github.com/ava-labs/avalanchego/snow/consensus/snowman"
aveng "github.com/ava-labs/avalanchego/snow/engine/avalanche"
avbootstrap "github.com/ava-labs/avalanchego/snow/engine/avalanche/bootstrap"
Expand Down
2 changes: 1 addition & 1 deletion database/rpcdb/db_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/ava-labs/avalanchego/utils"
"github.com/ava-labs/avalanchego/utils/set"

rpcdbpb "github.com/ava-labs/avalanchego/proto/pb/rpcdb"
rpcdbpb "github.com/ava-labs/avalanchego/buf/proto/pb/rpcdb"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion database/rpcdb/db_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/ava-labs/avalanchego/database"
"github.com/ava-labs/avalanchego/utils/units"

rpcdbpb "github.com/ava-labs/avalanchego/proto/pb/rpcdb"
rpcdbpb "github.com/ava-labs/avalanchego/buf/proto/pb/rpcdb"
)

const iterationBatchSize = 128 * units.KiB
Expand Down
2 changes: 1 addition & 1 deletion database/rpcdb/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils"

rpcdbpb "github.com/ava-labs/avalanchego/proto/pb/rpcdb"
rpcdbpb "github.com/ava-labs/avalanchego/buf/proto/pb/rpcdb"
)

type testDatabase struct {
Expand Down
2 changes: 1 addition & 1 deletion database/rpcdb/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package rpcdb
import (
"github.com/ava-labs/avalanchego/database"

rpcdbpb "github.com/ava-labs/avalanchego/proto/pb/rpcdb"
rpcdbpb "github.com/ava-labs/avalanchego/buf/proto/pb/rpcdb"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/DataDog/zstd v1.5.2
github.com/StephenButtolph/canoto v0.17.1
github.com/antithesishq/antithesis-sdk-go v0.3.8
github.com/ava-labs/coreth v0.15.3-rc.1
github.com/ava-labs/coreth v0.15.3-rc.1.0.20250714180715-588e8a77d371
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60
github.com/ava-labs/libevm v1.13.14-0.3.0.rc.1
github.com/btcsuite/btcd/btcutil v1.1.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/ava-labs/coreth v0.15.3-rc.1 h1:v7CMNT3tVi1cFp/6I9Xlln372+e6ztwAaCzW6vSDSVY=
github.com/ava-labs/coreth v0.15.3-rc.1/go.mod h1:80rG3mFUUPEfx9vj5QCAgKcrd1SH2UbbTAHKqYJfUpI=
github.com/ava-labs/coreth v0.15.3-rc.1.0.20250714180715-588e8a77d371 h1:6nKWzv8+8ct6vTQchu+2z9Sn7QIAWQebt90oWldcAXo=
github.com/ava-labs/coreth v0.15.3-rc.1.0.20250714180715-588e8a77d371/go.mod h1:80rG3mFUUPEfx9vj5QCAgKcrd1SH2UbbTAHKqYJfUpI=
github.com/ava-labs/firewood-go-ethhash/ffi v0.0.8 h1:f0ZbAiRE1srMiv/0DuXvPQZwgYbLC9OgAWbQUCMebTE=
github.com/ava-labs/firewood-go-ethhash/ffi v0.0.8/go.mod h1:j6spQFNSBAfcXKt9g0xbObW/8tMlGP4bFjPIsJmDg/o=
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60 h1:EL66gtXOAwR/4KYBjOV03LTWgkEXvLePribLlJNu4g0=
Expand Down
2 changes: 1 addition & 1 deletion ids/galiasreader/alias_reader_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/ava-labs/avalanchego/ids"

aliasreaderpb "github.com/ava-labs/avalanchego/proto/pb/aliasreader"
aliasreaderpb "github.com/ava-labs/avalanchego/buf/proto/pb/aliasreader"
)

var _ ids.AliaserReader = (*Client)(nil)
Expand Down
2 changes: 1 addition & 1 deletion ids/galiasreader/alias_reader_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/ava-labs/avalanchego/ids"

aliasreaderpb "github.com/ava-labs/avalanchego/proto/pb/aliasreader"
aliasreaderpb "github.com/ava-labs/avalanchego/buf/proto/pb/aliasreader"
)

var _ aliasreaderpb.AliasReaderServer = (*Server)(nil)
Expand Down
2 changes: 1 addition & 1 deletion ids/galiasreader/alias_reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/ava-labs/avalanchego/ids/idstest"
"github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils"

aliasreaderpb "github.com/ava-labs/avalanchego/proto/pb/aliasreader"
aliasreaderpb "github.com/ava-labs/avalanchego/buf/proto/pb/aliasreader"
)

func TestInterface(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion message/fields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"errors"
"time"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion message/inbound_msg_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package message
import (
"time"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/utils/timer/mockable"
)

Expand Down
2 changes: 1 addition & 1 deletion message/inbound_msg_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/stretchr/testify/require"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/utils/compression"
"github.com/ava-labs/avalanchego/utils/timer/mockable"
)
Expand Down
2 changes: 1 addition & 1 deletion message/internal_msg_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package message
import (
"fmt"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/utils/timer/mockable"
"github.com/ava-labs/avalanchego/version"
)
Expand Down
2 changes: 1 addition & 1 deletion message/messagemock/outbound_message_builder.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion message/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
"google.golang.org/protobuf/proto"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/utils/compression"
"github.com/ava-labs/avalanchego/utils/constants"
"github.com/ava-labs/avalanchego/utils/timer/mockable"
Expand Down
2 changes: 1 addition & 1 deletion message/messages_benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/utils/compression"
)

Expand Down
2 changes: 1 addition & 1 deletion message/messages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/staking"
"github.com/ava-labs/avalanchego/utils/compression"
)
Expand Down
2 changes: 1 addition & 1 deletion message/ops.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"fmt"

"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/utils/set"
)

Expand Down
2 changes: 1 addition & 1 deletion message/outbound_msg_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/netip"
"time"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/utils/compression"
"github.com/ava-labs/avalanchego/utils/ips"
)
Expand Down
2 changes: 1 addition & 1 deletion network/p2p/acp118/aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"go.uber.org/zap"
"google.golang.org/protobuf/proto"

"github.com/ava-labs/avalanchego/buf/proto/pb/sdk"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/network/p2p"
"github.com/ava-labs/avalanchego/proto/pb/sdk"
"github.com/ava-labs/avalanchego/utils/crypto/bls"
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ava-labs/avalanchego/utils/set"
Expand Down
2 changes: 1 addition & 1 deletion network/p2p/acp118/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (

"google.golang.org/protobuf/proto"

"github.com/ava-labs/avalanchego/buf/proto/pb/sdk"
"github.com/ava-labs/avalanchego/cache"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/network/p2p"
"github.com/ava-labs/avalanchego/proto/pb/sdk"
"github.com/ava-labs/avalanchego/snow/engine/common"
"github.com/ava-labs/avalanchego/vms/platformvm/warp"
)
Expand Down
2 changes: 1 addition & 1 deletion network/p2p/acp118/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"

"github.com/ava-labs/avalanchego/buf/proto/pb/sdk"
"github.com/ava-labs/avalanchego/cache"
"github.com/ava-labs/avalanchego/cache/lru"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/network/p2p"
"github.com/ava-labs/avalanchego/network/p2p/p2ptest"
"github.com/ava-labs/avalanchego/proto/pb/sdk"
"github.com/ava-labs/avalanchego/snow/engine/common"
"github.com/ava-labs/avalanchego/utils/crypto/bls"
"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
Expand Down
2 changes: 1 addition & 1 deletion network/p2p/gossip/gossip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"golang.org/x/exp/maps"
"google.golang.org/protobuf/proto"

"github.com/ava-labs/avalanchego/buf/proto/pb/sdk"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/network/p2p"
"github.com/ava-labs/avalanchego/proto/pb/sdk"
"github.com/ava-labs/avalanchego/snow/engine/enginetest"
"github.com/ava-labs/avalanchego/snow/validators"
"github.com/ava-labs/avalanchego/snow/validators/validatorstest"
Expand Down
2 changes: 1 addition & 1 deletion network/p2p/gossip/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package gossip
import (
"google.golang.org/protobuf/proto"

"github.com/ava-labs/avalanchego/buf/proto/pb/sdk"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/sdk"
"github.com/ava-labs/avalanchego/utils/bloom"
)

Expand Down
2 changes: 1 addition & 1 deletion network/peer/peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (

"go.uber.org/zap"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/message"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/staking"
"github.com/ava-labs/avalanchego/utils"
"github.com/ava-labs/avalanchego/utils/bloom"
Expand Down
4 changes: 2 additions & 2 deletions scripts/protobuf_codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ if [[ $(protoc-gen-go-grpc --version | cut -f2 -d' ') != "${PROTOC_GEN_GO_GRPC_V
exit 255
fi

BUF_MODULES=("proto" "connectproto")
BUF_MODULES=("proto" "connect")

REPO_ROOT=$PWD
REPO_ROOT="${PWD}/buf"
for BUF_MODULE in "${BUF_MODULES[@]}"; do
TARGET=$REPO_ROOT/$BUF_MODULE
if [ -n "${1:-}" ]; then
Expand Down
2 changes: 1 addition & 1 deletion snow/engine/avalanche/bootstrap/bootstrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/prometheus/client_golang/prometheus"
"go.uber.org/zap"

"github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
"github.com/ava-labs/avalanchego/cache/lru"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/proto/pb/p2p"
"github.com/ava-labs/avalanchego/snow"
"github.com/ava-labs/avalanchego/snow/choices"
"github.com/ava-labs/avalanchego/snow/consensus/avalanche"
Expand Down
2 changes: 1 addition & 1 deletion snow/engine/avalanche/bootstrap/bootstrapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/ava-labs/avalanchego/utils/set"
"github.com/ava-labs/avalanchego/version"

p2ppb "github.com/ava-labs/avalanchego/proto/pb/p2p"
p2ppb "github.com/ava-labs/avalanchego/buf/proto/pb/p2p"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion snow/engine/common/appsender/appsender_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ava-labs/avalanchego/snow/engine/common"
"github.com/ava-labs/avalanchego/utils/set"

appsenderpb "github.com/ava-labs/avalanchego/proto/pb/appsender"
appsenderpb "github.com/ava-labs/avalanchego/buf/proto/pb/appsender"
)

var _ common.AppSender = (*Client)(nil)
Expand Down
Loading