diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e57e857af5bc..393f8832a54f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,7 +131,7 @@ jobs: - uses: actions/checkout@v4 - uses: bufbuild/buf-action@dfda68eacb65895184c76b9ae522b977636a2c47 #v1.1.4 with: - input: "proto" + input: "buf/proto" pr_comment: false # Breaking changes are managed by the rpcchainvm protocol version. breaking: false diff --git a/api/admin/service.go b/api/admin/service.go index 097545ceaaad..093199ad87c2 100644 --- a/api/admin/service.go +++ b/api/admin/service.go @@ -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 ( diff --git a/api/admin/service_test.go b/api/admin/service_test.go index 182d65790fc8..4e5a994a3c89 100644 --- a/api/admin/service_test.go +++ b/api/admin/service_test.go @@ -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 { diff --git a/connectproto/buf.gen.yaml b/buf/connect/buf.gen.yaml similarity index 100% rename from connectproto/buf.gen.yaml rename to buf/connect/buf.gen.yaml diff --git a/connectproto/buf.lock b/buf/connect/buf.lock similarity index 100% rename from connectproto/buf.lock rename to buf/connect/buf.lock diff --git a/connectproto/buf.yaml b/buf/connect/buf.yaml similarity index 100% rename from connectproto/buf.yaml rename to buf/connect/buf.yaml diff --git a/connectproto/pb/xsvm/service.pb.go b/buf/connect/pb/xsvm/service.pb.go similarity index 97% rename from connectproto/pb/xsvm/service.pb.go rename to buf/connect/pb/xsvm/service.pb.go index 23bcddb3efe0..e94e9f3b5a8f 100644 --- a/connectproto/pb/xsvm/service.pb.go +++ b/buf/connect/pb/xsvm/service.pb.go @@ -222,11 +222,11 @@ var file_xsvm_service_proto_rawDesc = []byte{ 0x72, 0x65, 0x61, 0x6d, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x2e, 0x78, 0x73, 0x76, 0x6d, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x78, 0x73, 0x76, 0x6d, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x50, - 0x69, 0x6e, 0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x28, 0x01, 0x30, 0x01, 0x42, 0x36, 0x5a, 0x34, + 0x69, 0x6e, 0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x28, 0x01, 0x30, 0x01, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x76, 0x61, 0x2d, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x61, 0x76, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x67, 0x6f, 0x2f, - 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x2f, - 0x78, 0x73, 0x76, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2f, 0x70, 0x62, 0x2f, 0x78, + 0x73, 0x76, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/connectproto/pb/xsvm/xsvmconnect/service.connect.go b/buf/connect/pb/xsvm/xsvmconnect/service.connect.go similarity index 98% rename from connectproto/pb/xsvm/xsvmconnect/service.connect.go rename to buf/connect/pb/xsvm/xsvmconnect/service.connect.go index 1752bfea5c30..9b4f90d7d1b1 100644 --- a/connectproto/pb/xsvm/xsvmconnect/service.connect.go +++ b/buf/connect/pb/xsvm/xsvmconnect/service.connect.go @@ -8,7 +8,7 @@ import ( connect "connectrpc.com/connect" context "context" errors "errors" - xsvm "github.com/ava-labs/avalanchego/connectproto/pb/xsvm" + xsvm "github.com/ava-labs/avalanchego/buf/connect/pb/xsvm" http "net/http" strings "strings" ) diff --git a/connectproto/xsvm/service.proto b/buf/connect/xsvm/service.proto similarity index 82% rename from connectproto/xsvm/service.proto rename to buf/connect/xsvm/service.proto index f5cf2b6bbccc..f474daeef2a1 100644 --- a/connectproto/xsvm/service.proto +++ b/buf/connect/xsvm/service.proto @@ -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); diff --git a/proto/README.md b/buf/proto/README.md similarity index 100% rename from proto/README.md rename to buf/proto/README.md diff --git a/proto/aliasreader/aliasreader.proto b/buf/proto/aliasreader/aliasreader.proto similarity index 100% rename from proto/aliasreader/aliasreader.proto rename to buf/proto/aliasreader/aliasreader.proto diff --git a/proto/appsender/appsender.proto b/buf/proto/appsender/appsender.proto similarity index 100% rename from proto/appsender/appsender.proto rename to buf/proto/appsender/appsender.proto diff --git a/proto/buf.gen.yaml b/buf/proto/buf.gen.yaml similarity index 100% rename from proto/buf.gen.yaml rename to buf/proto/buf.gen.yaml diff --git a/proto/buf.lock b/buf/proto/buf.lock similarity index 100% rename from proto/buf.lock rename to buf/proto/buf.lock diff --git a/proto/buf.md b/buf/proto/buf.md similarity index 100% rename from proto/buf.md rename to buf/proto/buf.md diff --git a/proto/buf.yaml b/buf/proto/buf.yaml similarity index 100% rename from proto/buf.yaml rename to buf/proto/buf.yaml diff --git a/proto/http/http.proto b/buf/proto/http/http.proto similarity index 100% rename from proto/http/http.proto rename to buf/proto/http/http.proto diff --git a/proto/http/responsewriter/responsewriter.proto b/buf/proto/http/responsewriter/responsewriter.proto similarity index 100% rename from proto/http/responsewriter/responsewriter.proto rename to buf/proto/http/responsewriter/responsewriter.proto diff --git a/proto/io/reader/reader.proto b/buf/proto/io/reader/reader.proto similarity index 100% rename from proto/io/reader/reader.proto rename to buf/proto/io/reader/reader.proto diff --git a/proto/io/writer/writer.proto b/buf/proto/io/writer/writer.proto similarity index 100% rename from proto/io/writer/writer.proto rename to buf/proto/io/writer/writer.proto diff --git a/proto/net/conn/conn.proto b/buf/proto/net/conn/conn.proto similarity index 100% rename from proto/net/conn/conn.proto rename to buf/proto/net/conn/conn.proto diff --git a/proto/p2p/p2p.proto b/buf/proto/p2p/p2p.proto similarity index 100% rename from proto/p2p/p2p.proto rename to buf/proto/p2p/p2p.proto diff --git a/proto/pb/aliasreader/aliasreader.pb.go b/buf/proto/pb/aliasreader/aliasreader.pb.go similarity index 100% rename from proto/pb/aliasreader/aliasreader.pb.go rename to buf/proto/pb/aliasreader/aliasreader.pb.go diff --git a/proto/pb/aliasreader/aliasreader_grpc.pb.go b/buf/proto/pb/aliasreader/aliasreader_grpc.pb.go similarity index 100% rename from proto/pb/aliasreader/aliasreader_grpc.pb.go rename to buf/proto/pb/aliasreader/aliasreader_grpc.pb.go diff --git a/proto/pb/appsender/appsender.pb.go b/buf/proto/pb/appsender/appsender.pb.go similarity index 100% rename from proto/pb/appsender/appsender.pb.go rename to buf/proto/pb/appsender/appsender.pb.go diff --git a/proto/pb/appsender/appsender_grpc.pb.go b/buf/proto/pb/appsender/appsender_grpc.pb.go similarity index 100% rename from proto/pb/appsender/appsender_grpc.pb.go rename to buf/proto/pb/appsender/appsender_grpc.pb.go diff --git a/proto/pb/http/http.pb.go b/buf/proto/pb/http/http.pb.go similarity index 100% rename from proto/pb/http/http.pb.go rename to buf/proto/pb/http/http.pb.go diff --git a/proto/pb/http/http_grpc.pb.go b/buf/proto/pb/http/http_grpc.pb.go similarity index 100% rename from proto/pb/http/http_grpc.pb.go rename to buf/proto/pb/http/http_grpc.pb.go diff --git a/proto/pb/http/responsewriter/responsewriter.pb.go b/buf/proto/pb/http/responsewriter/responsewriter.pb.go similarity index 100% rename from proto/pb/http/responsewriter/responsewriter.pb.go rename to buf/proto/pb/http/responsewriter/responsewriter.pb.go diff --git a/proto/pb/http/responsewriter/responsewriter_grpc.pb.go b/buf/proto/pb/http/responsewriter/responsewriter_grpc.pb.go similarity index 100% rename from proto/pb/http/responsewriter/responsewriter_grpc.pb.go rename to buf/proto/pb/http/responsewriter/responsewriter_grpc.pb.go diff --git a/proto/pb/io/reader/reader.pb.go b/buf/proto/pb/io/reader/reader.pb.go similarity index 100% rename from proto/pb/io/reader/reader.pb.go rename to buf/proto/pb/io/reader/reader.pb.go diff --git a/proto/pb/io/reader/reader_grpc.pb.go b/buf/proto/pb/io/reader/reader_grpc.pb.go similarity index 100% rename from proto/pb/io/reader/reader_grpc.pb.go rename to buf/proto/pb/io/reader/reader_grpc.pb.go diff --git a/proto/pb/io/writer/writer.pb.go b/buf/proto/pb/io/writer/writer.pb.go similarity index 100% rename from proto/pb/io/writer/writer.pb.go rename to buf/proto/pb/io/writer/writer.pb.go diff --git a/proto/pb/io/writer/writer_grpc.pb.go b/buf/proto/pb/io/writer/writer_grpc.pb.go similarity index 100% rename from proto/pb/io/writer/writer_grpc.pb.go rename to buf/proto/pb/io/writer/writer_grpc.pb.go diff --git a/proto/pb/net/conn/conn.pb.go b/buf/proto/pb/net/conn/conn.pb.go similarity index 100% rename from proto/pb/net/conn/conn.pb.go rename to buf/proto/pb/net/conn/conn.pb.go diff --git a/proto/pb/net/conn/conn_grpc.pb.go b/buf/proto/pb/net/conn/conn_grpc.pb.go similarity index 100% rename from proto/pb/net/conn/conn_grpc.pb.go rename to buf/proto/pb/net/conn/conn_grpc.pb.go diff --git a/proto/pb/p2p/p2p.pb.go b/buf/proto/pb/p2p/p2p.pb.go similarity index 100% rename from proto/pb/p2p/p2p.pb.go rename to buf/proto/pb/p2p/p2p.pb.go diff --git a/proto/pb/platformvm/platformvm.pb.go b/buf/proto/pb/platformvm/platformvm.pb.go similarity index 100% rename from proto/pb/platformvm/platformvm.pb.go rename to buf/proto/pb/platformvm/platformvm.pb.go diff --git a/proto/pb/rpcdb/rpcdb.pb.go b/buf/proto/pb/rpcdb/rpcdb.pb.go similarity index 100% rename from proto/pb/rpcdb/rpcdb.pb.go rename to buf/proto/pb/rpcdb/rpcdb.pb.go diff --git a/proto/pb/rpcdb/rpcdb_grpc.pb.go b/buf/proto/pb/rpcdb/rpcdb_grpc.pb.go similarity index 100% rename from proto/pb/rpcdb/rpcdb_grpc.pb.go rename to buf/proto/pb/rpcdb/rpcdb_grpc.pb.go diff --git a/proto/pb/sdk/sdk.pb.go b/buf/proto/pb/sdk/sdk.pb.go similarity index 100% rename from proto/pb/sdk/sdk.pb.go rename to buf/proto/pb/sdk/sdk.pb.go diff --git a/proto/pb/sharedmemory/sharedmemory.pb.go b/buf/proto/pb/sharedmemory/sharedmemory.pb.go similarity index 100% rename from proto/pb/sharedmemory/sharedmemory.pb.go rename to buf/proto/pb/sharedmemory/sharedmemory.pb.go diff --git a/proto/pb/sharedmemory/sharedmemory_grpc.pb.go b/buf/proto/pb/sharedmemory/sharedmemory_grpc.pb.go similarity index 100% rename from proto/pb/sharedmemory/sharedmemory_grpc.pb.go rename to buf/proto/pb/sharedmemory/sharedmemory_grpc.pb.go diff --git a/proto/pb/signer/signer.pb.go b/buf/proto/pb/signer/signer.pb.go similarity index 100% rename from proto/pb/signer/signer.pb.go rename to buf/proto/pb/signer/signer.pb.go diff --git a/proto/pb/signer/signer_grpc.pb.go b/buf/proto/pb/signer/signer_grpc.pb.go similarity index 100% rename from proto/pb/signer/signer_grpc.pb.go rename to buf/proto/pb/signer/signer_grpc.pb.go diff --git a/proto/pb/sync/sync.pb.go b/buf/proto/pb/sync/sync.pb.go similarity index 100% rename from proto/pb/sync/sync.pb.go rename to buf/proto/pb/sync/sync.pb.go diff --git a/proto/pb/sync/sync_grpc.pb.go b/buf/proto/pb/sync/sync_grpc.pb.go similarity index 100% rename from proto/pb/sync/sync_grpc.pb.go rename to buf/proto/pb/sync/sync_grpc.pb.go diff --git a/proto/pb/validatorstate/validator_state.pb.go b/buf/proto/pb/validatorstate/validator_state.pb.go similarity index 100% rename from proto/pb/validatorstate/validator_state.pb.go rename to buf/proto/pb/validatorstate/validator_state.pb.go diff --git a/proto/pb/validatorstate/validator_state_grpc.pb.go b/buf/proto/pb/validatorstate/validator_state_grpc.pb.go similarity index 100% rename from proto/pb/validatorstate/validator_state_grpc.pb.go rename to buf/proto/pb/validatorstate/validator_state_grpc.pb.go diff --git a/proto/pb/vm/runtime/runtime.pb.go b/buf/proto/pb/vm/runtime/runtime.pb.go similarity index 100% rename from proto/pb/vm/runtime/runtime.pb.go rename to buf/proto/pb/vm/runtime/runtime.pb.go diff --git a/proto/pb/vm/runtime/runtime_grpc.pb.go b/buf/proto/pb/vm/runtime/runtime_grpc.pb.go similarity index 100% rename from proto/pb/vm/runtime/runtime_grpc.pb.go rename to buf/proto/pb/vm/runtime/runtime_grpc.pb.go diff --git a/proto/pb/vm/vm.pb.go b/buf/proto/pb/vm/vm.pb.go similarity index 100% rename from proto/pb/vm/vm.pb.go rename to buf/proto/pb/vm/vm.pb.go diff --git a/proto/pb/vm/vm_grpc.pb.go b/buf/proto/pb/vm/vm_grpc.pb.go similarity index 100% rename from proto/pb/vm/vm_grpc.pb.go rename to buf/proto/pb/vm/vm_grpc.pb.go diff --git a/proto/pb/warp/message.pb.go b/buf/proto/pb/warp/message.pb.go similarity index 100% rename from proto/pb/warp/message.pb.go rename to buf/proto/pb/warp/message.pb.go diff --git a/proto/pb/warp/message_grpc.pb.go b/buf/proto/pb/warp/message_grpc.pb.go similarity index 100% rename from proto/pb/warp/message_grpc.pb.go rename to buf/proto/pb/warp/message_grpc.pb.go diff --git a/proto/platformvm/platformvm.proto b/buf/proto/platformvm/platformvm.proto similarity index 100% rename from proto/platformvm/platformvm.proto rename to buf/proto/platformvm/platformvm.proto diff --git a/proto/rpcdb/rpcdb.proto b/buf/proto/rpcdb/rpcdb.proto similarity index 100% rename from proto/rpcdb/rpcdb.proto rename to buf/proto/rpcdb/rpcdb.proto diff --git a/proto/sdk/sdk.proto b/buf/proto/sdk/sdk.proto similarity index 100% rename from proto/sdk/sdk.proto rename to buf/proto/sdk/sdk.proto diff --git a/proto/sharedmemory/sharedmemory.proto b/buf/proto/sharedmemory/sharedmemory.proto similarity index 100% rename from proto/sharedmemory/sharedmemory.proto rename to buf/proto/sharedmemory/sharedmemory.proto diff --git a/proto/signer/signer.proto b/buf/proto/signer/signer.proto similarity index 100% rename from proto/signer/signer.proto rename to buf/proto/signer/signer.proto diff --git a/proto/sync/sync.proto b/buf/proto/sync/sync.proto similarity index 100% rename from proto/sync/sync.proto rename to buf/proto/sync/sync.proto diff --git a/proto/validatorstate/validator_state.proto b/buf/proto/validatorstate/validator_state.proto similarity index 100% rename from proto/validatorstate/validator_state.proto rename to buf/proto/validatorstate/validator_state.proto diff --git a/proto/vm/runtime/runtime.proto b/buf/proto/vm/runtime/runtime.proto similarity index 100% rename from proto/vm/runtime/runtime.proto rename to buf/proto/vm/runtime/runtime.proto diff --git a/proto/vm/vm.proto b/buf/proto/vm/vm.proto similarity index 100% rename from proto/vm/vm.proto rename to buf/proto/vm/vm.proto diff --git a/proto/warp/message.proto b/buf/proto/warp/message.proto similarity index 100% rename from proto/warp/message.proto rename to buf/proto/warp/message.proto diff --git a/chains/atomic/gsharedmemory/filtered_batch.go b/chains/atomic/gsharedmemory/filtered_batch.go index a6ba81251f57..2ddba6621361 100644 --- a/chains/atomic/gsharedmemory/filtered_batch.go +++ b/chains/atomic/gsharedmemory/filtered_batch.go @@ -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 { diff --git a/chains/atomic/gsharedmemory/shared_memory_client.go b/chains/atomic/gsharedmemory/shared_memory_client.go index 5e4af1eb558d..8bdb745bbdcb 100644 --- a/chains/atomic/gsharedmemory/shared_memory_client.go +++ b/chains/atomic/gsharedmemory/shared_memory_client.go @@ -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) diff --git a/chains/atomic/gsharedmemory/shared_memory_server.go b/chains/atomic/gsharedmemory/shared_memory_server.go index 0aaa71c01f8e..fba1abd93a39 100644 --- a/chains/atomic/gsharedmemory/shared_memory_server.go +++ b/chains/atomic/gsharedmemory/shared_memory_server.go @@ -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) diff --git a/chains/atomic/gsharedmemory/shared_memory_test.go b/chains/atomic/gsharedmemory/shared_memory_test.go index ffd325054f2e..ed5a4017040f 100644 --- a/chains/atomic/gsharedmemory/shared_memory_test.go +++ b/chains/atomic/gsharedmemory/shared_memory_test.go @@ -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) { diff --git a/chains/manager.go b/chains/manager.go index ad2928de85c1..1c555bd9e32a 100644 --- a/chains/manager.go +++ b/chains/manager.go @@ -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" diff --git a/database/rpcdb/db_client.go b/database/rpcdb/db_client.go index c71ccd0603e6..83e2fbea41e9 100644 --- a/database/rpcdb/db_client.go +++ b/database/rpcdb/db_client.go @@ -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 ( diff --git a/database/rpcdb/db_server.go b/database/rpcdb/db_server.go index 8a07a672d070..a049447825cd 100644 --- a/database/rpcdb/db_server.go +++ b/database/rpcdb/db_server.go @@ -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 diff --git a/database/rpcdb/db_test.go b/database/rpcdb/db_test.go index ef6f02236300..e8202f46360c 100644 --- a/database/rpcdb/db_test.go +++ b/database/rpcdb/db_test.go @@ -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 { diff --git a/database/rpcdb/errors.go b/database/rpcdb/errors.go index 52788cc0a42a..29e53e3cc78b 100644 --- a/database/rpcdb/errors.go +++ b/database/rpcdb/errors.go @@ -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 ( diff --git a/go.mod b/go.mod index e32b9028a44d..dd86e16898ef 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index e0b7f2b3c8fa..36ff83f276c5 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/ids/galiasreader/alias_reader_client.go b/ids/galiasreader/alias_reader_client.go index daa3771af568..7b8cb3920b43 100644 --- a/ids/galiasreader/alias_reader_client.go +++ b/ids/galiasreader/alias_reader_client.go @@ -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) diff --git a/ids/galiasreader/alias_reader_server.go b/ids/galiasreader/alias_reader_server.go index eeb9083ca1e4..fc2761b8ce98 100644 --- a/ids/galiasreader/alias_reader_server.go +++ b/ids/galiasreader/alias_reader_server.go @@ -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) diff --git a/ids/galiasreader/alias_reader_test.go b/ids/galiasreader/alias_reader_test.go index 1835bb1792bc..0274a45af236 100644 --- a/ids/galiasreader/alias_reader_test.go +++ b/ids/galiasreader/alias_reader_test.go @@ -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) { diff --git a/message/fields.go b/message/fields.go index 282ee63e8e74..2820635462fa 100644 --- a/message/fields.go +++ b/message/fields.go @@ -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 ( diff --git a/message/inbound_msg_builder.go b/message/inbound_msg_builder.go index 5b059e7667e9..c3e52f0d974f 100644 --- a/message/inbound_msg_builder.go +++ b/message/inbound_msg_builder.go @@ -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" ) diff --git a/message/inbound_msg_builder_test.go b/message/inbound_msg_builder_test.go index e3e85cf90327..629e81e27dd8 100644 --- a/message/inbound_msg_builder_test.go +++ b/message/inbound_msg_builder_test.go @@ -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" ) diff --git a/message/internal_msg_builder.go b/message/internal_msg_builder.go index aca7a9455b47..9b92d48ef2e7 100644 --- a/message/internal_msg_builder.go +++ b/message/internal_msg_builder.go @@ -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" ) diff --git a/message/messagemock/outbound_message_builder.go b/message/messagemock/outbound_message_builder.go index 89794619de73..cd53d0d16727 100644 --- a/message/messagemock/outbound_message_builder.go +++ b/message/messagemock/outbound_message_builder.go @@ -14,9 +14,9 @@ import ( reflect "reflect" time "time" + p2p "github.com/ava-labs/avalanchego/buf/proto/pb/p2p" ids "github.com/ava-labs/avalanchego/ids" message "github.com/ava-labs/avalanchego/message" - p2p "github.com/ava-labs/avalanchego/proto/pb/p2p" ips "github.com/ava-labs/avalanchego/utils/ips" gomock "go.uber.org/mock/gomock" ) diff --git a/message/messages.go b/message/messages.go index 9e9139249c4a..9344d21d1655 100644 --- a/message/messages.go +++ b/message/messages.go @@ -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" diff --git a/message/messages_benchmark_test.go b/message/messages_benchmark_test.go index d1fb9b3875de..075fffb19366 100644 --- a/message/messages_benchmark_test.go +++ b/message/messages_benchmark_test.go @@ -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" ) diff --git a/message/messages_test.go b/message/messages_test.go index 917f3644ba85..96c63c2facbd 100644 --- a/message/messages_test.go +++ b/message/messages_test.go @@ -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" ) diff --git a/message/ops.go b/message/ops.go index 513d4da3a091..b18b05deeb65 100644 --- a/message/ops.go +++ b/message/ops.go @@ -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" ) diff --git a/message/outbound_msg_builder.go b/message/outbound_msg_builder.go index 042236c81482..4a1f23f94747 100644 --- a/message/outbound_msg_builder.go +++ b/message/outbound_msg_builder.go @@ -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" ) diff --git a/network/p2p/acp118/aggregator.go b/network/p2p/acp118/aggregator.go index 43d34e6f1304..b7b93395d1cd 100644 --- a/network/p2p/acp118/aggregator.go +++ b/network/p2p/acp118/aggregator.go @@ -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" diff --git a/network/p2p/acp118/handler.go b/network/p2p/acp118/handler.go index 519cce072fd5..48131cd1feea 100644 --- a/network/p2p/acp118/handler.go +++ b/network/p2p/acp118/handler.go @@ -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" ) diff --git a/network/p2p/acp118/handler_test.go b/network/p2p/acp118/handler_test.go index 7456232c436c..e5ca61788bcf 100644 --- a/network/p2p/acp118/handler_test.go +++ b/network/p2p/acp118/handler_test.go @@ -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" diff --git a/network/p2p/gossip/gossip_test.go b/network/p2p/gossip/gossip_test.go index b6a29526fb33..e07f61c2d002 100644 --- a/network/p2p/gossip/gossip_test.go +++ b/network/p2p/gossip/gossip_test.go @@ -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" diff --git a/network/p2p/gossip/message.go b/network/p2p/gossip/message.go index 47e6784e43d8..a53c5bd65cce 100644 --- a/network/p2p/gossip/message.go +++ b/network/p2p/gossip/message.go @@ -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" ) diff --git a/network/peer/peer.go b/network/peer/peer.go index d65a85171f90..df50443cc4c6 100644 --- a/network/peer/peer.go +++ b/network/peer/peer.go @@ -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" diff --git a/scripts/protobuf_codegen.sh b/scripts/protobuf_codegen.sh index c80ca48b9f8d..83b6bd0f5557 100755 --- a/scripts/protobuf_codegen.sh +++ b/scripts/protobuf_codegen.sh @@ -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 diff --git a/snow/engine/avalanche/bootstrap/bootstrapper.go b/snow/engine/avalanche/bootstrap/bootstrapper.go index 511fc30a9e1e..a246c462ba72 100644 --- a/snow/engine/avalanche/bootstrap/bootstrapper.go +++ b/snow/engine/avalanche/bootstrap/bootstrapper.go @@ -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" diff --git a/snow/engine/avalanche/bootstrap/bootstrapper_test.go b/snow/engine/avalanche/bootstrap/bootstrapper_test.go index fa1248773801..c9c561c0831e 100644 --- a/snow/engine/avalanche/bootstrap/bootstrapper_test.go +++ b/snow/engine/avalanche/bootstrap/bootstrapper_test.go @@ -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 ( diff --git a/snow/engine/common/appsender/appsender_client.go b/snow/engine/common/appsender/appsender_client.go index 4477034f17cb..630edfaa44c7 100644 --- a/snow/engine/common/appsender/appsender_client.go +++ b/snow/engine/common/appsender/appsender_client.go @@ -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) diff --git a/snow/engine/common/appsender/appsender_server.go b/snow/engine/common/appsender/appsender_server.go index 73092d3e0860..52170938aeec 100644 --- a/snow/engine/common/appsender/appsender_server.go +++ b/snow/engine/common/appsender/appsender_server.go @@ -12,7 +12,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 _ appsenderpb.AppSenderServer = (*Server)(nil) diff --git a/snow/engine/snowman/bootstrap/bootstrapper.go b/snow/engine/snowman/bootstrap/bootstrapper.go index fe84de943025..9b3f66dd59dc 100644 --- a/snow/engine/snowman/bootstrap/bootstrapper.go +++ b/snow/engine/snowman/bootstrap/bootstrapper.go @@ -13,10 +13,10 @@ import ( "go.uber.org/zap" + "github.com/ava-labs/avalanchego/buf/proto/pb/p2p" "github.com/ava-labs/avalanchego/database" "github.com/ava-labs/avalanchego/genesis" "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/consensus/snowman" "github.com/ava-labs/avalanchego/snow/consensus/snowman/bootstrapper" diff --git a/snow/engine/snowman/bootstrap/bootstrapper_test.go b/snow/engine/snowman/bootstrap/bootstrapper_test.go index dcbf7d0a2dea..56d1a1a305b8 100644 --- a/snow/engine/snowman/bootstrap/bootstrapper_test.go +++ b/snow/engine/snowman/bootstrap/bootstrapper_test.go @@ -31,7 +31,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 errUnknownBlock = errors.New("unknown block") diff --git a/snow/engine/snowman/engine.go b/snow/engine/snowman/engine.go index eadb7abc3649..8cfd05d7af56 100644 --- a/snow/engine/snowman/engine.go +++ b/snow/engine/snowman/engine.go @@ -11,11 +11,11 @@ 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" "github.com/ava-labs/avalanchego/cache/lru" "github.com/ava-labs/avalanchego/cache/metercacher" "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/consensus/snowman" "github.com/ava-labs/avalanchego/snow/consensus/snowman/poll" diff --git a/snow/engine/snowman/syncer/state_syncer.go b/snow/engine/snowman/syncer/state_syncer.go index cdd6d411636f..6a15bb6d9383 100644 --- a/snow/engine/snowman/syncer/state_syncer.go +++ b/snow/engine/snowman/syncer/state_syncer.go @@ -10,9 +10,9 @@ import ( "go.uber.org/zap" + "github.com/ava-labs/avalanchego/buf/proto/pb/p2p" "github.com/ava-labs/avalanchego/database" "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/engine/common" "github.com/ava-labs/avalanchego/snow/engine/snowman/block" diff --git a/snow/networking/handler/engine.go b/snow/networking/handler/engine.go index e3de84ac8989..cd2edb51bed5 100644 --- a/snow/networking/handler/engine.go +++ b/snow/networking/handler/engine.go @@ -4,7 +4,7 @@ package handler import ( - "github.com/ava-labs/avalanchego/proto/pb/p2p" + "github.com/ava-labs/avalanchego/buf/proto/pb/p2p" "github.com/ava-labs/avalanchego/snow" "github.com/ava-labs/avalanchego/snow/engine/common" ) diff --git a/snow/networking/handler/engine_test.go b/snow/networking/handler/engine_test.go index e9b2b8ae0162..644821bc12ef 100644 --- a/snow/networking/handler/engine_test.go +++ b/snow/networking/handler/engine_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ava-labs/avalanchego/proto/pb/p2p" + "github.com/ava-labs/avalanchego/buf/proto/pb/p2p" ) func TestEngineManager_Get(t *testing.T) { diff --git a/snow/networking/handler/handler.go b/snow/networking/handler/handler.go index 5554af689cf1..d747afcdfb78 100644 --- a/snow/networking/handler/handler.go +++ b/snow/networking/handler/handler.go @@ -31,7 +31,7 @@ import ( "github.com/ava-labs/avalanchego/utils/set" "github.com/ava-labs/avalanchego/utils/timer/mockable" - p2ppb "github.com/ava-labs/avalanchego/proto/pb/p2p" + p2ppb "github.com/ava-labs/avalanchego/buf/proto/pb/p2p" commontracker "github.com/ava-labs/avalanchego/snow/engine/common/tracker" ) diff --git a/snow/networking/handler/handler_test.go b/snow/networking/handler/handler_test.go index e956abcbf05f..ac141f487e10 100644 --- a/snow/networking/handler/handler_test.go +++ b/snow/networking/handler/handler_test.go @@ -29,7 +29,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" commontracker "github.com/ava-labs/avalanchego/snow/engine/common/tracker" ) diff --git a/snow/networking/handler/health_test.go b/snow/networking/handler/health_test.go index c6733bb7f931..bbbf0f556136 100644 --- a/snow/networking/handler/health_test.go +++ b/snow/networking/handler/health_test.go @@ -27,7 +27,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" commontracker "github.com/ava-labs/avalanchego/snow/engine/common/tracker" ) diff --git a/snow/networking/handler/message_queue.go b/snow/networking/handler/message_queue.go index fbf362c86f73..e70b1a1797c4 100644 --- a/snow/networking/handler/message_queue.go +++ b/snow/networking/handler/message_queue.go @@ -10,9 +10,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/ids" "github.com/ava-labs/avalanchego/message" - "github.com/ava-labs/avalanchego/proto/pb/p2p" "github.com/ava-labs/avalanchego/snow/networking/tracker" "github.com/ava-labs/avalanchego/snow/validators" "github.com/ava-labs/avalanchego/utils/buffer" diff --git a/snow/networking/handler/message_queue_test.go b/snow/networking/handler/message_queue_test.go index 810f6185a60b..191ef198dcee 100644 --- a/snow/networking/handler/message_queue_test.go +++ b/snow/networking/handler/message_queue_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" + "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/snow/networking/tracker/trackermock" "github.com/ava-labs/avalanchego/snow/validators" "github.com/ava-labs/avalanchego/utils/constants" diff --git a/snow/networking/router/chain_router.go b/snow/networking/router/chain_router.go index 97e697bd4c7f..504e6e21155e 100644 --- a/snow/networking/router/chain_router.go +++ b/snow/networking/router/chain_router.go @@ -14,9 +14,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/ids" "github.com/ava-labs/avalanchego/message" - "github.com/ava-labs/avalanchego/proto/pb/p2p" "github.com/ava-labs/avalanchego/snow/networking/benchlist" "github.com/ava-labs/avalanchego/snow/networking/handler" "github.com/ava-labs/avalanchego/snow/networking/timeout" diff --git a/snow/networking/router/chain_router_test.go b/snow/networking/router/chain_router_test.go index f0ae998caac5..86d146dd14c1 100644 --- a/snow/networking/router/chain_router_test.go +++ b/snow/networking/router/chain_router_test.go @@ -36,7 +36,7 @@ import ( "github.com/ava-labs/avalanchego/utils/timer" "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" commontracker "github.com/ava-labs/avalanchego/snow/engine/common/tracker" ) diff --git a/snow/networking/router/router.go b/snow/networking/router/router.go index 28fed03019b6..0ba646be8652 100644 --- a/snow/networking/router/router.go +++ b/snow/networking/router/router.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/ava-labs/avalanchego/api/health" + "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/snow/networking/benchlist" "github.com/ava-labs/avalanchego/snow/networking/handler" "github.com/ava-labs/avalanchego/snow/networking/timeout" diff --git a/snow/networking/router/routermock/router.go b/snow/networking/router/routermock/router.go index b1bda6ab8fa4..3d90765a7a8e 100644 --- a/snow/networking/router/routermock/router.go +++ b/snow/networking/router/routermock/router.go @@ -14,9 +14,9 @@ import ( reflect "reflect" time "time" + p2p "github.com/ava-labs/avalanchego/buf/proto/pb/p2p" ids "github.com/ava-labs/avalanchego/ids" message "github.com/ava-labs/avalanchego/message" - p2p "github.com/ava-labs/avalanchego/proto/pb/p2p" handler "github.com/ava-labs/avalanchego/snow/networking/handler" router "github.com/ava-labs/avalanchego/snow/networking/router" timeout "github.com/ava-labs/avalanchego/snow/networking/timeout" diff --git a/snow/networking/router/traced_router.go b/snow/networking/router/traced_router.go index 4042079a8ae0..0926a7a58bb2 100644 --- a/snow/networking/router/traced_router.go +++ b/snow/networking/router/traced_router.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/otel/attribute" + "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/snow/networking/handler" "github.com/ava-labs/avalanchego/snow/networking/timeout" "github.com/ava-labs/avalanchego/trace" diff --git a/snow/networking/sender/sender.go b/snow/networking/sender/sender.go index 549eec43f15e..872257eb314d 100644 --- a/snow/networking/sender/sender.go +++ b/snow/networking/sender/sender.go @@ -9,9 +9,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/ids" "github.com/ava-labs/avalanchego/message" - "github.com/ava-labs/avalanchego/proto/pb/p2p" "github.com/ava-labs/avalanchego/snow" "github.com/ava-labs/avalanchego/snow/engine/common" "github.com/ava-labs/avalanchego/snow/networking/router" diff --git a/snow/networking/sender/sender_test.go b/snow/networking/sender/sender_test.go index cfafc034c1bb..450690883bf3 100644 --- a/snow/networking/sender/sender_test.go +++ b/snow/networking/sender/sender_test.go @@ -43,7 +43,7 @@ import ( "github.com/ava-labs/avalanchego/utils/timer" "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" commontracker "github.com/ava-labs/avalanchego/snow/engine/common/tracker" . "github.com/ava-labs/avalanchego/snow/networking/sender" diff --git a/snow/state.go b/snow/state.go index 091cd31f50f1..a622e14a504a 100644 --- a/snow/state.go +++ b/snow/state.go @@ -6,7 +6,7 @@ package snow import ( "errors" - "github.com/ava-labs/avalanchego/proto/pb/p2p" + "github.com/ava-labs/avalanchego/buf/proto/pb/p2p" ) const ( diff --git a/snow/validators/gvalidators/validator_state_client.go b/snow/validators/gvalidators/validator_state_client.go index be1b91c44d0b..59aac6e063ab 100644 --- a/snow/validators/gvalidators/validator_state_client.go +++ b/snow/validators/gvalidators/validator_state_client.go @@ -13,7 +13,7 @@ import ( "github.com/ava-labs/avalanchego/snow/validators" "github.com/ava-labs/avalanchego/utils/crypto/bls" - pb "github.com/ava-labs/avalanchego/proto/pb/validatorstate" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/validatorstate" ) var ( diff --git a/snow/validators/gvalidators/validator_state_server.go b/snow/validators/gvalidators/validator_state_server.go index 668bf967df63..f8593356e8ec 100644 --- a/snow/validators/gvalidators/validator_state_server.go +++ b/snow/validators/gvalidators/validator_state_server.go @@ -12,7 +12,7 @@ import ( "github.com/ava-labs/avalanchego/snow/validators" "github.com/ava-labs/avalanchego/utils/crypto/bls" - pb "github.com/ava-labs/avalanchego/proto/pb/validatorstate" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/validatorstate" ) var _ pb.ValidatorStateServer = (*Server)(nil) diff --git a/snow/validators/gvalidators/validator_state_test.go b/snow/validators/gvalidators/validator_state_test.go index ee55ef8568e0..d86ef043ffed 100644 --- a/snow/validators/gvalidators/validator_state_test.go +++ b/snow/validators/gvalidators/validator_state_test.go @@ -19,7 +19,7 @@ import ( "github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner" "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - pb "github.com/ava-labs/avalanchego/proto/pb/validatorstate" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/validatorstate" ) var errCustom = errors.New("custom") diff --git a/tests/e2e/p/l1.go b/tests/e2e/p/l1.go index 486017075796..3aab4df3d140 100644 --- a/tests/e2e/p/l1.go +++ b/tests/e2e/p/l1.go @@ -16,10 +16,10 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/proto" + "github.com/ava-labs/avalanchego/buf/proto/pb/sdk" "github.com/ava-labs/avalanchego/config" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/network/peer" - "github.com/ava-labs/avalanchego/proto/pb/sdk" "github.com/ava-labs/avalanchego/snow/networking/router" "github.com/ava-labs/avalanchego/tests" "github.com/ava-labs/avalanchego/tests/fixture/e2e" @@ -38,10 +38,10 @@ import ( "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" "github.com/ava-labs/avalanchego/vms/secp256k1fx" + p2ppb "github.com/ava-labs/avalanchego/buf/proto/pb/p2p" + platformvmpb "github.com/ava-labs/avalanchego/buf/proto/pb/platformvm" p2pmessage "github.com/ava-labs/avalanchego/message" p2psdk "github.com/ava-labs/avalanchego/network/p2p" - p2ppb "github.com/ava-labs/avalanchego/proto/pb/p2p" - platformvmpb "github.com/ava-labs/avalanchego/proto/pb/platformvm" snowvalidators "github.com/ava-labs/avalanchego/snow/validators" platformapi "github.com/ava-labs/avalanchego/vms/platformvm/api" platformvmvalidators "github.com/ava-labs/avalanchego/vms/platformvm/validators" diff --git a/tests/e2e/vms/xsvm.go b/tests/e2e/vms/xsvm.go index 2efa06115002..49bdfd1362e3 100644 --- a/tests/e2e/vms/xsvm.go +++ b/tests/e2e/vms/xsvm.go @@ -19,8 +19,8 @@ import ( "golang.org/x/sync/errgroup" "github.com/ava-labs/avalanchego/api/connectclient" - "github.com/ava-labs/avalanchego/connectproto/pb/xsvm" - "github.com/ava-labs/avalanchego/connectproto/pb/xsvm/xsvmconnect" + "github.com/ava-labs/avalanchego/buf/connect/pb/xsvm" + "github.com/ava-labs/avalanchego/buf/connect/pb/xsvm/xsvmconnect" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/tests/fixture/e2e" "github.com/ava-labs/avalanchego/tests/fixture/subnet" diff --git a/utils/crypto/bls/signer/rpcsigner/client.go b/utils/crypto/bls/signer/rpcsigner/client.go index 5c02d672352d..50992f9b3288 100644 --- a/utils/crypto/bls/signer/rpcsigner/client.go +++ b/utils/crypto/bls/signer/rpcsigner/client.go @@ -10,7 +10,7 @@ import ( "github.com/ava-labs/avalanchego/utils/crypto/bls" - pb "github.com/ava-labs/avalanchego/proto/pb/signer" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/signer" ) var _ bls.Signer = (*Client)(nil) diff --git a/utils/crypto/bls/signer/rpcsigner/client_test.go b/utils/crypto/bls/signer/rpcsigner/client_test.go index 32aa68744ab3..ca6cdadb73e4 100644 --- a/utils/crypto/bls/signer/rpcsigner/client_test.go +++ b/utils/crypto/bls/signer/rpcsigner/client_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/ava-labs/avalanchego/proto/pb/signer" + "github.com/ava-labs/avalanchego/buf/proto/pb/signer" "github.com/ava-labs/avalanchego/utils/crypto/bls" "github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner" ) diff --git a/vms/example/xsvm/api/ping.go b/vms/example/xsvm/api/ping.go index 3abbc9e5ad3a..95f91d1c3c14 100644 --- a/vms/example/xsvm/api/ping.go +++ b/vms/example/xsvm/api/ping.go @@ -12,8 +12,8 @@ import ( "connectrpc.com/connect" "go.uber.org/zap" - "github.com/ava-labs/avalanchego/connectproto/pb/xsvm" - "github.com/ava-labs/avalanchego/connectproto/pb/xsvm/xsvmconnect" + "github.com/ava-labs/avalanchego/buf/connect/pb/xsvm" + "github.com/ava-labs/avalanchego/buf/connect/pb/xsvm/xsvmconnect" "github.com/ava-labs/avalanchego/utils/logging" ) diff --git a/vms/example/xsvm/vm.go b/vms/example/xsvm/vm.go index f5bf39c3618a..4d40091ddc81 100644 --- a/vms/example/xsvm/vm.go +++ b/vms/example/xsvm/vm.go @@ -13,7 +13,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" - "github.com/ava-labs/avalanchego/connectproto/pb/xsvm/xsvmconnect" + "github.com/ava-labs/avalanchego/buf/connect/pb/xsvm/xsvmconnect" "github.com/ava-labs/avalanchego/database" "github.com/ava-labs/avalanchego/database/versiondb" "github.com/ava-labs/avalanchego/ids" diff --git a/vms/platformvm/network/warp.go b/vms/platformvm/network/warp.go index 0d3c62cc5f27..c8b5da666453 100644 --- a/vms/platformvm/network/warp.go +++ b/vms/platformvm/network/warp.go @@ -11,10 +11,10 @@ import ( "google.golang.org/protobuf/proto" + "github.com/ava-labs/avalanchego/buf/proto/pb/platformvm" "github.com/ava-labs/avalanchego/database" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/network/p2p/acp118" - "github.com/ava-labs/avalanchego/proto/pb/platformvm" "github.com/ava-labs/avalanchego/snow/engine/common" "github.com/ava-labs/avalanchego/vms/platformvm/state" "github.com/ava-labs/avalanchego/vms/platformvm/warp" diff --git a/vms/platformvm/network/warp_test.go b/vms/platformvm/network/warp_test.go index 7b6975840a43..252c3ced3776 100644 --- a/vms/platformvm/network/warp_test.go +++ b/vms/platformvm/network/warp_test.go @@ -15,8 +15,8 @@ import ( "golang.org/x/exp/rand" "google.golang.org/protobuf/proto" + "github.com/ava-labs/avalanchego/buf/proto/pb/platformvm" "github.com/ava-labs/avalanchego/ids" - "github.com/ava-labs/avalanchego/proto/pb/platformvm" "github.com/ava-labs/avalanchego/snow/engine/common" "github.com/ava-labs/avalanchego/utils" "github.com/ava-labs/avalanchego/utils/constants" diff --git a/vms/platformvm/vm_test.go b/vms/platformvm/vm_test.go index ba20bb29ad0d..90928c7bc2f4 100644 --- a/vms/platformvm/vm_test.go +++ b/vms/platformvm/vm_test.go @@ -61,7 +61,7 @@ import ( "github.com/ava-labs/avalanchego/vms/secp256k1fx" "github.com/ava-labs/avalanchego/wallet/chain/p/wallet" - 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" smeng "github.com/ava-labs/avalanchego/snow/engine/snowman" smblock "github.com/ava-labs/avalanchego/snow/engine/snowman/block" diff --git a/vms/platformvm/warp/gwarp/client.go b/vms/platformvm/warp/gwarp/client.go index 0b51a54971f7..ba8f861672a8 100644 --- a/vms/platformvm/warp/gwarp/client.go +++ b/vms/platformvm/warp/gwarp/client.go @@ -8,7 +8,7 @@ import ( "github.com/ava-labs/avalanchego/vms/platformvm/warp" - pb "github.com/ava-labs/avalanchego/proto/pb/warp" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/warp" ) var _ warp.Signer = (*Client)(nil) diff --git a/vms/platformvm/warp/gwarp/server.go b/vms/platformvm/warp/gwarp/server.go index 7857f4e0ee70..16a187aa7e1b 100644 --- a/vms/platformvm/warp/gwarp/server.go +++ b/vms/platformvm/warp/gwarp/server.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/vms/platformvm/warp" - pb "github.com/ava-labs/avalanchego/proto/pb/warp" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/warp" ) var _ pb.SignerServer = (*Server)(nil) diff --git a/vms/platformvm/warp/gwarp/signer_test.go b/vms/platformvm/warp/gwarp/signer_test.go index 46f88ce5537b..861e224eceeb 100644 --- a/vms/platformvm/warp/gwarp/signer_test.go +++ b/vms/platformvm/warp/gwarp/signer_test.go @@ -16,7 +16,7 @@ import ( "github.com/ava-labs/avalanchego/vms/platformvm/warp/signertest" "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - pb "github.com/ava-labs/avalanchego/proto/pb/warp" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/warp" ) type testSigner struct { diff --git a/vms/rpcchainvm/errors.go b/vms/rpcchainvm/errors.go index 37d043fe2797..761a2c1a37ee 100644 --- a/vms/rpcchainvm/errors.go +++ b/vms/rpcchainvm/errors.go @@ -7,7 +7,7 @@ import ( "github.com/ava-labs/avalanchego/database" "github.com/ava-labs/avalanchego/snow/engine/snowman/block" - vmpb "github.com/ava-labs/avalanchego/proto/pb/vm" + vmpb "github.com/ava-labs/avalanchego/buf/proto/pb/vm" ) var ( diff --git a/vms/rpcchainvm/ghttp/gconn/conn_client.go b/vms/rpcchainvm/ghttp/gconn/conn_client.go index 1dffabb23f8d..dd7442e31f7d 100644 --- a/vms/rpcchainvm/ghttp/gconn/conn_client.go +++ b/vms/rpcchainvm/ghttp/gconn/conn_client.go @@ -16,7 +16,7 @@ import ( "github.com/ava-labs/avalanchego/utils/wrappers" - connpb "github.com/ava-labs/avalanchego/proto/pb/net/conn" + connpb "github.com/ava-labs/avalanchego/buf/proto/pb/net/conn" ) var _ net.Conn = (*Client)(nil) diff --git a/vms/rpcchainvm/ghttp/gconn/conn_server.go b/vms/rpcchainvm/ghttp/gconn/conn_server.go index 06d49a77e5d3..11da47555a95 100644 --- a/vms/rpcchainvm/ghttp/gconn/conn_server.go +++ b/vms/rpcchainvm/ghttp/gconn/conn_server.go @@ -15,7 +15,7 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - connpb "github.com/ava-labs/avalanchego/proto/pb/net/conn" + connpb "github.com/ava-labs/avalanchego/buf/proto/pb/net/conn" ) var _ connpb.ConnServer = (*Server)(nil) diff --git a/vms/rpcchainvm/ghttp/gconn/gconn_test.go b/vms/rpcchainvm/ghttp/gconn/gconn_test.go index 09a681615e0c..5d001ccbbaee 100644 --- a/vms/rpcchainvm/ghttp/gconn/gconn_test.go +++ b/vms/rpcchainvm/ghttp/gconn/gconn_test.go @@ -17,7 +17,7 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - connpb "github.com/ava-labs/avalanchego/proto/pb/net/conn" + connpb "github.com/ava-labs/avalanchego/buf/proto/pb/net/conn" ) // TestErrIOEOF tests that if a net.Conn returns an io.EOF, it propagates that diff --git a/vms/rpcchainvm/ghttp/greader/greader_test.go b/vms/rpcchainvm/ghttp/greader/greader_test.go index d7bd0857d4ac..e73069ac63fd 100644 --- a/vms/rpcchainvm/ghttp/greader/greader_test.go +++ b/vms/rpcchainvm/ghttp/greader/greader_test.go @@ -14,7 +14,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" - "github.com/ava-labs/avalanchego/proto/pb/io/reader" + "github.com/ava-labs/avalanchego/buf/proto/pb/io/reader" ) // TestErrIOEOF tests that if an io.EOF is returned by an io.Reader, it diff --git a/vms/rpcchainvm/ghttp/greader/reader_client.go b/vms/rpcchainvm/ghttp/greader/reader_client.go index df380b2f2160..95aa2d5aa45c 100644 --- a/vms/rpcchainvm/ghttp/greader/reader_client.go +++ b/vms/rpcchainvm/ghttp/greader/reader_client.go @@ -8,7 +8,7 @@ import ( "errors" "io" - readerpb "github.com/ava-labs/avalanchego/proto/pb/io/reader" + readerpb "github.com/ava-labs/avalanchego/buf/proto/pb/io/reader" ) var _ io.Reader = (*Client)(nil) diff --git a/vms/rpcchainvm/ghttp/greader/reader_server.go b/vms/rpcchainvm/ghttp/greader/reader_server.go index 3782e42aa736..8946adc9fffd 100644 --- a/vms/rpcchainvm/ghttp/greader/reader_server.go +++ b/vms/rpcchainvm/ghttp/greader/reader_server.go @@ -7,7 +7,7 @@ import ( "context" "io" - readerpb "github.com/ava-labs/avalanchego/proto/pb/io/reader" + readerpb "github.com/ava-labs/avalanchego/buf/proto/pb/io/reader" ) var _ readerpb.ReaderServer = (*Server)(nil) diff --git a/vms/rpcchainvm/ghttp/gresponsewriter/writer_client.go b/vms/rpcchainvm/ghttp/gresponsewriter/writer_client.go index 1c45567097cf..a3ca720fa3f9 100644 --- a/vms/rpcchainvm/ghttp/gresponsewriter/writer_client.go +++ b/vms/rpcchainvm/ghttp/gresponsewriter/writer_client.go @@ -16,10 +16,10 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/ghttp/gwriter" "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - responsewriterpb "github.com/ava-labs/avalanchego/proto/pb/http/responsewriter" - readerpb "github.com/ava-labs/avalanchego/proto/pb/io/reader" - writerpb "github.com/ava-labs/avalanchego/proto/pb/io/writer" - connpb "github.com/ava-labs/avalanchego/proto/pb/net/conn" + responsewriterpb "github.com/ava-labs/avalanchego/buf/proto/pb/http/responsewriter" + readerpb "github.com/ava-labs/avalanchego/buf/proto/pb/io/reader" + writerpb "github.com/ava-labs/avalanchego/buf/proto/pb/io/writer" + connpb "github.com/ava-labs/avalanchego/buf/proto/pb/net/conn" ) var ( diff --git a/vms/rpcchainvm/ghttp/gresponsewriter/writer_server.go b/vms/rpcchainvm/ghttp/gresponsewriter/writer_server.go index 86dd996369fc..654ba324b4e3 100644 --- a/vms/rpcchainvm/ghttp/gresponsewriter/writer_server.go +++ b/vms/rpcchainvm/ghttp/gresponsewriter/writer_server.go @@ -15,10 +15,10 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/ghttp/gwriter" "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - responsewriterpb "github.com/ava-labs/avalanchego/proto/pb/http/responsewriter" - readerpb "github.com/ava-labs/avalanchego/proto/pb/io/reader" - writerpb "github.com/ava-labs/avalanchego/proto/pb/io/writer" - connpb "github.com/ava-labs/avalanchego/proto/pb/net/conn" + responsewriterpb "github.com/ava-labs/avalanchego/buf/proto/pb/http/responsewriter" + readerpb "github.com/ava-labs/avalanchego/buf/proto/pb/io/reader" + writerpb "github.com/ava-labs/avalanchego/buf/proto/pb/io/writer" + connpb "github.com/ava-labs/avalanchego/buf/proto/pb/net/conn" ) var ( diff --git a/vms/rpcchainvm/ghttp/gwriter/writer_client.go b/vms/rpcchainvm/ghttp/gwriter/writer_client.go index f68cefa7c2a6..ec044922cee4 100644 --- a/vms/rpcchainvm/ghttp/gwriter/writer_client.go +++ b/vms/rpcchainvm/ghttp/gwriter/writer_client.go @@ -8,7 +8,7 @@ import ( "errors" "io" - writerpb "github.com/ava-labs/avalanchego/proto/pb/io/writer" + writerpb "github.com/ava-labs/avalanchego/buf/proto/pb/io/writer" ) var _ io.Writer = (*Client)(nil) diff --git a/vms/rpcchainvm/ghttp/gwriter/writer_server.go b/vms/rpcchainvm/ghttp/gwriter/writer_server.go index 1b216dc2a4ee..9ba3ee861265 100644 --- a/vms/rpcchainvm/ghttp/gwriter/writer_server.go +++ b/vms/rpcchainvm/ghttp/gwriter/writer_server.go @@ -7,7 +7,7 @@ import ( "context" "io" - writerpb "github.com/ava-labs/avalanchego/proto/pb/io/writer" + writerpb "github.com/ava-labs/avalanchego/buf/proto/pb/io/writer" ) var _ writerpb.WriterServer = (*Server)(nil) diff --git a/vms/rpcchainvm/ghttp/http_client.go b/vms/rpcchainvm/ghttp/http_client.go index 1a38d7a5ab1a..afe8a1c227d1 100644 --- a/vms/rpcchainvm/ghttp/http_client.go +++ b/vms/rpcchainvm/ghttp/http_client.go @@ -7,13 +7,13 @@ import ( "io" "net/http" - "github.com/ava-labs/avalanchego/proto/pb/io/reader" + "github.com/ava-labs/avalanchego/buf/proto/pb/io/reader" "github.com/ava-labs/avalanchego/vms/rpcchainvm/ghttp/greader" "github.com/ava-labs/avalanchego/vms/rpcchainvm/ghttp/gresponsewriter" "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - httppb "github.com/ava-labs/avalanchego/proto/pb/http" - responsewriterpb "github.com/ava-labs/avalanchego/proto/pb/http/responsewriter" + httppb "github.com/ava-labs/avalanchego/buf/proto/pb/http" + responsewriterpb "github.com/ava-labs/avalanchego/buf/proto/pb/http/responsewriter" ) var _ http.Handler = (*Client)(nil) diff --git a/vms/rpcchainvm/ghttp/http_server.go b/vms/rpcchainvm/ghttp/http_server.go index 0cf70eb60ff0..46a0b273c103 100644 --- a/vms/rpcchainvm/ghttp/http_server.go +++ b/vms/rpcchainvm/ghttp/http_server.go @@ -12,13 +12,13 @@ import ( "net/http" "net/url" - "github.com/ava-labs/avalanchego/proto/pb/io/reader" + "github.com/ava-labs/avalanchego/buf/proto/pb/io/reader" "github.com/ava-labs/avalanchego/vms/rpcchainvm/ghttp/greader" "github.com/ava-labs/avalanchego/vms/rpcchainvm/ghttp/gresponsewriter" "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - httppb "github.com/ava-labs/avalanchego/proto/pb/http" - responsewriterpb "github.com/ava-labs/avalanchego/proto/pb/http/responsewriter" + httppb "github.com/ava-labs/avalanchego/buf/proto/pb/http" + responsewriterpb "github.com/ava-labs/avalanchego/buf/proto/pb/http/responsewriter" ) var ( diff --git a/vms/rpcchainvm/ghttp/http_test.go b/vms/rpcchainvm/ghttp/http_test.go index e8ddb7f02c72..8c4e4412ff95 100644 --- a/vms/rpcchainvm/ghttp/http_test.go +++ b/vms/rpcchainvm/ghttp/http_test.go @@ -19,7 +19,7 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - httppb "github.com/ava-labs/avalanchego/proto/pb/http" + httppb "github.com/ava-labs/avalanchego/buf/proto/pb/http" ) var _ io.Reader = (*infiniteStream)(nil) diff --git a/vms/rpcchainvm/grpcutils/client_test.go b/vms/rpcchainvm/grpcutils/client_test.go index 326f9a40119b..90a0af36107a 100644 --- a/vms/rpcchainvm/grpcutils/client_test.go +++ b/vms/rpcchainvm/grpcutils/client_test.go @@ -18,7 +18,7 @@ import ( "github.com/ava-labs/avalanchego/database/memdb" "github.com/ava-labs/avalanchego/database/rpcdb" - pb "github.com/ava-labs/avalanchego/proto/pb/rpcdb" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/rpcdb" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" ) diff --git a/vms/rpcchainvm/grpcutils/util.go b/vms/rpcchainvm/grpcutils/util.go index 7fa997857932..c8d687c3293e 100644 --- a/vms/rpcchainvm/grpcutils/util.go +++ b/vms/rpcchainvm/grpcutils/util.go @@ -12,7 +12,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - httppb "github.com/ava-labs/avalanchego/proto/pb/http" + httppb "github.com/ava-labs/avalanchego/buf/proto/pb/http" spb "google.golang.org/genproto/googleapis/rpc/status" tspb "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/vms/rpcchainvm/gruntime/runtime_client.go b/vms/rpcchainvm/gruntime/runtime_client.go index 8db4adbeb204..1037318cea6a 100644 --- a/vms/rpcchainvm/gruntime/runtime_client.go +++ b/vms/rpcchainvm/gruntime/runtime_client.go @@ -8,7 +8,7 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/runtime" - pb "github.com/ava-labs/avalanchego/proto/pb/vm/runtime" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/vm/runtime" ) var _ runtime.Initializer = (*Client)(nil) diff --git a/vms/rpcchainvm/gruntime/runtime_server.go b/vms/rpcchainvm/gruntime/runtime_server.go index 09be6c121eef..e7b8288c439e 100644 --- a/vms/rpcchainvm/gruntime/runtime_server.go +++ b/vms/rpcchainvm/gruntime/runtime_server.go @@ -10,7 +10,7 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/runtime" - pb "github.com/ava-labs/avalanchego/proto/pb/vm/runtime" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/vm/runtime" ) var _ pb.RuntimeServer = (*Server)(nil) diff --git a/vms/rpcchainvm/runtime/subprocess/runtime.go b/vms/rpcchainvm/runtime/subprocess/runtime.go index 5623d9be3bd1..cc1f2b227a8a 100644 --- a/vms/rpcchainvm/runtime/subprocess/runtime.go +++ b/vms/rpcchainvm/runtime/subprocess/runtime.go @@ -20,7 +20,7 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/gruntime" "github.com/ava-labs/avalanchego/vms/rpcchainvm/runtime" - pb "github.com/ava-labs/avalanchego/proto/pb/vm/runtime" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/vm/runtime" ) type Config struct { diff --git a/vms/rpcchainvm/vm.go b/vms/rpcchainvm/vm.go index 94dee55b91a1..c055e4ff5b64 100644 --- a/vms/rpcchainvm/vm.go +++ b/vms/rpcchainvm/vm.go @@ -21,8 +21,8 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/gruntime" "github.com/ava-labs/avalanchego/vms/rpcchainvm/runtime" - vmpb "github.com/ava-labs/avalanchego/proto/pb/vm" - runtimepb "github.com/ava-labs/avalanchego/proto/pb/vm/runtime" + vmpb "github.com/ava-labs/avalanchego/buf/proto/pb/vm" + runtimepb "github.com/ava-labs/avalanchego/buf/proto/pb/vm/runtime" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/vms/rpcchainvm/vm_client.go b/vms/rpcchainvm/vm_client.go index d9e08146a4ba..15bd4bfff02d 100644 --- a/vms/rpcchainvm/vm_client.go +++ b/vms/rpcchainvm/vm_client.go @@ -41,14 +41,14 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" "github.com/ava-labs/avalanchego/vms/rpcchainvm/runtime" - aliasreaderpb "github.com/ava-labs/avalanchego/proto/pb/aliasreader" - appsenderpb "github.com/ava-labs/avalanchego/proto/pb/appsender" - httppb "github.com/ava-labs/avalanchego/proto/pb/http" - rpcdbpb "github.com/ava-labs/avalanchego/proto/pb/rpcdb" - sharedmemorypb "github.com/ava-labs/avalanchego/proto/pb/sharedmemory" - validatorstatepb "github.com/ava-labs/avalanchego/proto/pb/validatorstate" - vmpb "github.com/ava-labs/avalanchego/proto/pb/vm" - warppb "github.com/ava-labs/avalanchego/proto/pb/warp" + aliasreaderpb "github.com/ava-labs/avalanchego/buf/proto/pb/aliasreader" + appsenderpb "github.com/ava-labs/avalanchego/buf/proto/pb/appsender" + httppb "github.com/ava-labs/avalanchego/buf/proto/pb/http" + rpcdbpb "github.com/ava-labs/avalanchego/buf/proto/pb/rpcdb" + sharedmemorypb "github.com/ava-labs/avalanchego/buf/proto/pb/sharedmemory" + validatorstatepb "github.com/ava-labs/avalanchego/buf/proto/pb/validatorstate" + vmpb "github.com/ava-labs/avalanchego/buf/proto/pb/vm" + warppb "github.com/ava-labs/avalanchego/buf/proto/pb/warp" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" dto "github.com/prometheus/client_model/go" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/vms/rpcchainvm/vm_server.go b/vms/rpcchainvm/vm_server.go index 954c68a1b6a1..4b15d17bde5b 100644 --- a/vms/rpcchainvm/vm_server.go +++ b/vms/rpcchainvm/vm_server.go @@ -38,14 +38,14 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/ghttp" "github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils" - aliasreaderpb "github.com/ava-labs/avalanchego/proto/pb/aliasreader" - appsenderpb "github.com/ava-labs/avalanchego/proto/pb/appsender" - httppb "github.com/ava-labs/avalanchego/proto/pb/http" - rpcdbpb "github.com/ava-labs/avalanchego/proto/pb/rpcdb" - sharedmemorypb "github.com/ava-labs/avalanchego/proto/pb/sharedmemory" - validatorstatepb "github.com/ava-labs/avalanchego/proto/pb/validatorstate" - vmpb "github.com/ava-labs/avalanchego/proto/pb/vm" - warppb "github.com/ava-labs/avalanchego/proto/pb/warp" + aliasreaderpb "github.com/ava-labs/avalanchego/buf/proto/pb/aliasreader" + appsenderpb "github.com/ava-labs/avalanchego/buf/proto/pb/appsender" + httppb "github.com/ava-labs/avalanchego/buf/proto/pb/http" + rpcdbpb "github.com/ava-labs/avalanchego/buf/proto/pb/rpcdb" + sharedmemorypb "github.com/ava-labs/avalanchego/buf/proto/pb/sharedmemory" + validatorstatepb "github.com/ava-labs/avalanchego/buf/proto/pb/validatorstate" + vmpb "github.com/ava-labs/avalanchego/buf/proto/pb/vm" + warppb "github.com/ava-labs/avalanchego/buf/proto/pb/warp" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" ) diff --git a/vms/rpcchainvm/vm_test.go b/vms/rpcchainvm/vm_test.go index 914a91f3cb66..fc62880b40f3 100644 --- a/vms/rpcchainvm/vm_test.go +++ b/vms/rpcchainvm/vm_test.go @@ -32,7 +32,7 @@ import ( "github.com/ava-labs/avalanchego/vms/rpcchainvm/runtime" "github.com/ava-labs/avalanchego/vms/rpcchainvm/runtime/subprocess" - vmpb "github.com/ava-labs/avalanchego/proto/pb/vm" + vmpb "github.com/ava-labs/avalanchego/buf/proto/pb/vm" ) const ( diff --git a/wallet/subnet/primary/examples/sign-l1-validator-registration/main.go b/wallet/subnet/primary/examples/sign-l1-validator-registration/main.go index 1bb549d47d10..a22348b9dfd3 100644 --- a/wallet/subnet/primary/examples/sign-l1-validator-registration/main.go +++ b/wallet/subnet/primary/examples/sign-l1-validator-registration/main.go @@ -13,10 +13,10 @@ import ( "google.golang.org/protobuf/proto" "github.com/ava-labs/avalanchego/api/info" + "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/network/peer" - "github.com/ava-labs/avalanchego/proto/pb/sdk" "github.com/ava-labs/avalanchego/snow/networking/router" "github.com/ava-labs/avalanchego/utils/compression" "github.com/ava-labs/avalanchego/utils/constants" diff --git a/wallet/subnet/primary/examples/sign-l1-validator-removal-genesis/main.go b/wallet/subnet/primary/examples/sign-l1-validator-removal-genesis/main.go index db4ebfd1a8e2..df2b193e17df 100644 --- a/wallet/subnet/primary/examples/sign-l1-validator-removal-genesis/main.go +++ b/wallet/subnet/primary/examples/sign-l1-validator-removal-genesis/main.go @@ -13,11 +13,11 @@ import ( "google.golang.org/protobuf/proto" "github.com/ava-labs/avalanchego/api/info" + "github.com/ava-labs/avalanchego/buf/proto/pb/platformvm" + "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/network/peer" - "github.com/ava-labs/avalanchego/proto/pb/platformvm" - "github.com/ava-labs/avalanchego/proto/pb/sdk" "github.com/ava-labs/avalanchego/snow/networking/router" "github.com/ava-labs/avalanchego/utils/compression" "github.com/ava-labs/avalanchego/utils/constants" diff --git a/wallet/subnet/primary/examples/sign-l1-validator-removal-registration/main.go b/wallet/subnet/primary/examples/sign-l1-validator-removal-registration/main.go index b9ff2e244a61..0892c53f2379 100644 --- a/wallet/subnet/primary/examples/sign-l1-validator-removal-registration/main.go +++ b/wallet/subnet/primary/examples/sign-l1-validator-removal-registration/main.go @@ -14,10 +14,10 @@ import ( "google.golang.org/protobuf/proto" "github.com/ava-labs/avalanchego/api/info" + "github.com/ava-labs/avalanchego/buf/proto/pb/platformvm" + "github.com/ava-labs/avalanchego/buf/proto/pb/sdk" "github.com/ava-labs/avalanchego/network/p2p" "github.com/ava-labs/avalanchego/network/peer" - "github.com/ava-labs/avalanchego/proto/pb/platformvm" - "github.com/ava-labs/avalanchego/proto/pb/sdk" "github.com/ava-labs/avalanchego/snow/networking/router" "github.com/ava-labs/avalanchego/utils/compression" "github.com/ava-labs/avalanchego/utils/constants" diff --git a/wallet/subnet/primary/examples/sign-l1-validator-weight/main.go b/wallet/subnet/primary/examples/sign-l1-validator-weight/main.go index 7aa73ff73226..84abf9f22726 100644 --- a/wallet/subnet/primary/examples/sign-l1-validator-weight/main.go +++ b/wallet/subnet/primary/examples/sign-l1-validator-weight/main.go @@ -14,9 +14,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/ava-labs/avalanchego/api/info" + "github.com/ava-labs/avalanchego/buf/proto/pb/sdk" "github.com/ava-labs/avalanchego/network/p2p" "github.com/ava-labs/avalanchego/network/peer" - "github.com/ava-labs/avalanchego/proto/pb/sdk" "github.com/ava-labs/avalanchego/snow/networking/router" "github.com/ava-labs/avalanchego/utils/compression" "github.com/ava-labs/avalanchego/utils/constants" diff --git a/wallet/subnet/primary/examples/sign-subnet-to-l1-conversion/main.go b/wallet/subnet/primary/examples/sign-subnet-to-l1-conversion/main.go index b7a42d694853..da720a1ae26c 100644 --- a/wallet/subnet/primary/examples/sign-subnet-to-l1-conversion/main.go +++ b/wallet/subnet/primary/examples/sign-subnet-to-l1-conversion/main.go @@ -13,10 +13,10 @@ import ( "google.golang.org/protobuf/proto" "github.com/ava-labs/avalanchego/api/info" + "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/network/peer" - "github.com/ava-labs/avalanchego/proto/pb/sdk" "github.com/ava-labs/avalanchego/snow/networking/router" "github.com/ava-labs/avalanchego/utils/compression" "github.com/ava-labs/avalanchego/utils/constants" diff --git a/x/merkledb/proof.go b/x/merkledb/proof.go index 6e03763cb77e..bf5663fd4401 100644 --- a/x/merkledb/proof.go +++ b/x/merkledb/proof.go @@ -16,7 +16,7 @@ import ( "github.com/ava-labs/avalanchego/trace" "github.com/ava-labs/avalanchego/utils/maybe" - pb "github.com/ava-labs/avalanchego/proto/pb/sync" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/sync" ) const verificationCacheSize = math.MaxUint16 diff --git a/x/merkledb/proof_test.go b/x/merkledb/proof_test.go index 5deaf57a3848..59515e9b2ba5 100644 --- a/x/merkledb/proof_test.go +++ b/x/merkledb/proof_test.go @@ -19,7 +19,7 @@ import ( "github.com/ava-labs/avalanchego/utils/maybe" "github.com/ava-labs/avalanchego/utils/set" - pb "github.com/ava-labs/avalanchego/proto/pb/sync" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/sync" ) func Test_Proof_Empty(t *testing.T) { diff --git a/x/sync/client_test.go b/x/sync/client_test.go index 8aa5a5112506..0e1d769aadab 100644 --- a/x/sync/client_test.go +++ b/x/sync/client_test.go @@ -19,7 +19,7 @@ import ( "github.com/ava-labs/avalanchego/trace" "github.com/ava-labs/avalanchego/x/merkledb" - pb "github.com/ava-labs/avalanchego/proto/pb/sync" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/sync" ) var _ p2p.Handler = (*flakyHandler)(nil) diff --git a/x/sync/g_db/db_client.go b/x/sync/g_db/db_client.go index 48fc8d2b4c7f..c86f65d5630a 100644 --- a/x/sync/g_db/db_client.go +++ b/x/sync/g_db/db_client.go @@ -14,7 +14,7 @@ import ( "github.com/ava-labs/avalanchego/x/merkledb" "github.com/ava-labs/avalanchego/x/sync" - pb "github.com/ava-labs/avalanchego/proto/pb/sync" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/sync" ) var _ sync.DB = (*DBClient)(nil) diff --git a/x/sync/g_db/db_server.go b/x/sync/g_db/db_server.go index e90a55900e04..253b2071f523 100644 --- a/x/sync/g_db/db_server.go +++ b/x/sync/g_db/db_server.go @@ -14,7 +14,7 @@ import ( "github.com/ava-labs/avalanchego/x/merkledb" "github.com/ava-labs/avalanchego/x/sync" - pb "github.com/ava-labs/avalanchego/proto/pb/sync" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/sync" ) var _ pb.DBServer = (*DBServer)(nil) diff --git a/x/sync/manager.go b/x/sync/manager.go index f97672f9545c..94c5f67474e2 100644 --- a/x/sync/manager.go +++ b/x/sync/manager.go @@ -26,7 +26,7 @@ import ( "github.com/ava-labs/avalanchego/utils/set" "github.com/ava-labs/avalanchego/x/merkledb" - pb "github.com/ava-labs/avalanchego/proto/pb/sync" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/sync" ) const ( diff --git a/x/sync/network_server.go b/x/sync/network_server.go index c4e34eb9549f..b6dbd39436ae 100644 --- a/x/sync/network_server.go +++ b/x/sync/network_server.go @@ -21,7 +21,7 @@ import ( "github.com/ava-labs/avalanchego/utils/units" "github.com/ava-labs/avalanchego/x/merkledb" - pb "github.com/ava-labs/avalanchego/proto/pb/sync" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/sync" ) const ( diff --git a/x/sync/network_server_test.go b/x/sync/network_server_test.go index cb32418e5d7f..0b6b2eb661af 100644 --- a/x/sync/network_server_test.go +++ b/x/sync/network_server_test.go @@ -19,7 +19,7 @@ import ( "github.com/ava-labs/avalanchego/snow/engine/common" "github.com/ava-labs/avalanchego/x/merkledb" - pb "github.com/ava-labs/avalanchego/proto/pb/sync" + pb "github.com/ava-labs/avalanchego/buf/proto/pb/sync" ) func Test_Server_GetRangeProof(t *testing.T) {