Skip to content

Commit

Permalink
Deprecate pb.gw.go files (#14464)
Browse files Browse the repository at this point in the history
* Clean pb.gw.go files

* Deprecate pb.gw.go file support
  • Loading branch information
syjn99 authored Sep 20, 2024
1 parent bc9c719 commit 1a1cc25
Show file tree
Hide file tree
Showing 19 changed files with 6 additions and 63 deletions.
2 changes: 0 additions & 2 deletions .policy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ approval_rules:
only_changed_files:
paths:
- "*pb.go"
- "*pb.gw.go"
- "*.bazel"
options:
ignore_commits_by:
Expand Down Expand Up @@ -69,7 +68,6 @@ approval_rules:
changed_files:
ignore:
- "*pb.go"
- "*pb.gw.go"
- "*.bazel"
options:
ignore_commits_by:
Expand Down
4 changes: 2 additions & 2 deletions hack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ This subproject contains useful bash scripts for working with our repository. We

## update-go-pbs.sh

This script generates the *.pb.go and *.pb.gw.go files from the *.proto files.
After running `update-go-pbs.sh` keep only the *.pb.go and *pb.gw.go for the protos that have changed before checking in.
This script generates the *.pb.go files from the *.proto files.
After running `update-go-pbs.sh` keep only the *.pb.go for the protos that have changed before checking in.
*Note*: the generated files may not have imports correctly linted and will need to be fixed to remote associated errors.
2 changes: 1 addition & 1 deletion hack/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cygwin*) system="windows" ;;
esac
readonly system

# Get locations of pb.go and pb.gw.go files.
# Get locations of pb.go files.
findutil="find"
# On OSX `find` is not GNU find compatible, so require "findutils" package.
if [ "$system" == "darwin" ]; then
Expand Down
2 changes: 1 addition & 1 deletion hack/update-go-pbs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ bazel query 'attr(testonly, 0, //proto/...)' | xargs bazel build $@
file_list=()
while IFS= read -d $'\0' -r file; do
file_list=("${file_list[@]}" "$file")
done < <($findutil -L "$(bazel info bazel-bin)"/proto -type f -regextype sed -regex ".*pb\.\(gw\.\)\?go$" -print0)
done < <($findutil -L "$(bazel info bazel-bin)"/proto -type f -regextype sed -regex ".*pb\.go$" -print0)

arraylength=${#file_list[@]}
searchstring="prysmaticlabs/prysm/v5/"
Expand Down
4 changes: 0 additions & 4 deletions proto/eth/v1/attestation.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v1/beacon_block.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v1/beacon_chain.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v1/events.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v1/node.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v1/validator.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v2/beacon_block.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v2/beacon_chain.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v2/beacon_lightclient.pb.gw.go

This file was deleted.

3 changes: 2 additions & 1 deletion proto/eth/v2/custom.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package eth
import (
"bytes"
"fmt"
enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
"math/bits"

enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"

v1 "github.com/prysmaticlabs/prysm/v5/proto/eth/v1"
)

Expand Down
4 changes: 0 additions & 4 deletions proto/eth/v2/ssz.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v2/sync_committee.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v2/validator.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v2/version.pb.gw.go

This file was deleted.

4 changes: 0 additions & 4 deletions proto/eth/v2/withdrawals.pb.gw.go

This file was deleted.

0 comments on commit 1a1cc25

Please sign in to comment.