From bc700368401303e84f91a2ac6360ae95dbb6f008 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Mon, 20 Jan 2025 11:01:14 +0800 Subject: [PATCH] build: add imports for go generate tools (#24682) --- build/tools/tools.go | 1 + cmd/faucet/faucet.go | 2 +- core/genesis.go | 4 ++-- core/types/block.go | 2 +- core/types/log.go | 2 +- core/types/receipt.go | 2 +- core/types/tx_access_list.go | 2 +- core/vm/logger.go | 2 +- eth/ethconfig/config.go | 2 +- eth/tracers/internal/tracers/tracers.go | 2 +- go.mod | 1 + go.sum | 2 ++ internal/jsre/deps/deps.go | 2 +- p2p/discv5/net.go | 2 +- tests/block_test_util.go | 2 +- tests/difficulty_test_util.go | 2 +- tests/state_test_util.go | 4 ++-- tests/transaction_test_util.go | 2 +- tests/vm_test_util.go | 2 +- 19 files changed, 22 insertions(+), 18 deletions(-) diff --git a/build/tools/tools.go b/build/tools/tools.go index e9e2241d2fe87..c09fbe3882790 100644 --- a/build/tools/tools.go +++ b/build/tools/tools.go @@ -22,6 +22,7 @@ package tools import ( // Tool imports for go:generate. _ "github.com/fjl/gencodec" + _ "github.com/kevinburke/go-bindata/go-bindata" _ "golang.org/x/tools/cmd/stringer" _ "google.golang.org/protobuf/cmd/protoc-gen-go" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 36388d79962a1..0cfcfdbd78983 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -17,7 +17,7 @@ // faucet is a Ether faucet backed by a light client. package main -//go:generate go-bindata -nometadata -o website.go faucet.html +//go:generate go run github.com/kevinburke/go-bindata/go-bindata -nometadata -o website.go faucet.html //go:generate gofmt -w -s website.go import ( diff --git a/core/genesis.go b/core/genesis.go index d14b1c73d153a..2f69485c42c72 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -39,8 +39,8 @@ import ( "github.com/XinFinOrg/XDPoSChain/rlp" ) -//go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go -//go:generate gencodec -type GenesisAccount -field-override genesisAccountMarshaling -out gen_genesis_account.go +//go:generate go run github.com/fjl/gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go +//go:generate go run github.com/fjl/gencodec -type GenesisAccount -field-override genesisAccountMarshaling -out gen_genesis_account.go var errGenesisNoConfig = errors.New("genesis has no chain configuration") diff --git a/core/types/block.go b/core/types/block.go index 57c470baa16c3..07112b8d2e965 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -59,7 +59,7 @@ func (n *BlockNonce) UnmarshalText(input []byte) error { return hexutil.UnmarshalFixedText("BlockNonce", input, n[:]) } -//go:generate gencodec -type Header -field-override headerMarshaling -out gen_header_json.go +//go:generate go run github.com/fjl/gencodec -type Header -field-override headerMarshaling -out gen_header_json.go // Header represents a block header in the Ethereum blockchain. type Header struct { diff --git a/core/types/log.go b/core/types/log.go index cf1dbc4ecb584..bdee27e99bd09 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -25,7 +25,7 @@ import ( "github.com/XinFinOrg/XDPoSChain/rlp" ) -//go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go +//go:generate go run github.com/fjl/gencodec -type Log -field-override logMarshaling -out gen_log_json.go // Log represents a contract log event. These events are generated by the LOG opcode and // stored/indexed by the node. diff --git a/core/types/receipt.go b/core/types/receipt.go index f858e8855eea3..ef35e6b00e899 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -31,7 +31,7 @@ import ( "github.com/XinFinOrg/XDPoSChain/rlp" ) -//go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go +//go:generate go run github.com/fjl/gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go var ( receiptStatusFailedRLP = []byte{} diff --git a/core/types/tx_access_list.go b/core/types/tx_access_list.go index f2d4ee4881d34..8c9577ef15359 100644 --- a/core/types/tx_access_list.go +++ b/core/types/tx_access_list.go @@ -22,7 +22,7 @@ import ( "github.com/XinFinOrg/XDPoSChain/common" ) -//go:generate gencodec -type AccessTuple -out gen_access_tuple.go +//go:generate go run github.com/fjl/gencodec -type AccessTuple -out gen_access_tuple.go // AccessList is an EIP-2930 access list. type AccessList []AccessTuple diff --git a/core/vm/logger.go b/core/vm/logger.go index 24178f54ff228..1aaf0a721a24e 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -56,7 +56,7 @@ type LogConfig struct { Overrides *params.ChainConfig `json:"overrides,omitempty"` } -//go:generate gencodec -type StructLog -field-override structLogMarshaling -out gen_structlog.go +//go:generate go run github.com/fjl/gencodec -type StructLog -field-override structLogMarshaling -out gen_structlog.go // StructLog is emitted to the EVM each cycle and lists information about the current internal state // prior to the execution of the statement. diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index 642b59c4a0c0e..c3c78d0b0d077 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -100,7 +100,7 @@ func init() { } } -//go:generate gencodec -type Config -field-override configMarshaling -formats toml -out gen_config.go +//go:generate go run github.com/fjl/gencodec -type Config -field-override configMarshaling -formats toml -out gen_config.go // Config contains configuration options for of the ETH and LES protocols. type Config struct { diff --git a/eth/tracers/internal/tracers/tracers.go b/eth/tracers/internal/tracers/tracers.go index 2e40975bb9efc..785962b1d6c3b 100644 --- a/eth/tracers/internal/tracers/tracers.go +++ b/eth/tracers/internal/tracers/tracers.go @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-ethereum library. If not, see . -//go:generate go-bindata -nometadata -o assets.go -pkg tracers -ignore tracers.go -ignore assets.go ./... +//go:generate go run github.com/kevinburke/go-bindata/go-bindata -nometadata -o assets.go -pkg tracers -ignore tracers.go -ignore assets.go ./... //go:generate gofmt -s -w assets.go // Package tracers contains the actual JavaScript tracer assets. diff --git a/go.mod b/go.mod index a4a458bbebc1b..fdae1bfb7bfad 100644 --- a/go.mod +++ b/go.mod @@ -53,6 +53,7 @@ require ( github.com/go-yaml/yaml v2.1.0+incompatible github.com/influxdata/influxdb-client-go/v2 v2.4.0 github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c + github.com/kevinburke/go-bindata v3.23.0+incompatible github.com/kylelemons/godebug v1.1.0 github.com/mattn/go-isatty v0.0.17 github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7 diff --git a/go.sum b/go.sum index 8e3cc32731b74..83e3d080d1ea4 100644 --- a/go.sum +++ b/go.sum @@ -111,6 +111,8 @@ github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4d github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/karalabe/hid v1.0.0 h1:+/CIMNXhSU/zIJgnIvBD2nKHxS/bnRHhhs9xBryLpPo= github.com/karalabe/hid v1.0.0/go.mod h1:Vr51f8rUOLYrfrWDFlV12GGQgM5AT8sVh+2fY4MPeu8= +github.com/kevinburke/go-bindata v3.23.0+incompatible h1:rqNOXZlqrYhMVVAsQx8wuc+LaA73YcfbQ407wAykyS8= +github.com/kevinburke/go-bindata v3.23.0+incompatible/go.mod h1:/pEEZ72flUW2p0yi30bslSp9YqD9pysLxunQDdb2CPM= github.com/kilic/bls12-381 v0.1.0 h1:encrdjqKMEvabVQ7qYOKu1OvhqpK4s47wDYtNiPtlp4= github.com/kilic/bls12-381 v0.1.0/go.mod h1:vDTTHJONJ6G+P2R74EhnyotQDTliQDnFEwhdmfzw1ig= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= diff --git a/internal/jsre/deps/deps.go b/internal/jsre/deps/deps.go index fe2e6f2fadf49..e7af4685164b3 100644 --- a/internal/jsre/deps/deps.go +++ b/internal/jsre/deps/deps.go @@ -17,5 +17,5 @@ // Package deps contains the console JavaScript dependencies Go embedded. package deps -//go:generate go-bindata -nometadata -pkg deps -o bindata.go bignumber.js web3.js +//go:generate go run github.com/kevinburke/go-bindata/go-bindata -nometadata -pkg deps -o bindata.go bignumber.js web3.js //go:generate gofmt -w -s bindata.go diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index 13e9cca70ea7b..d165d57138e9e 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -824,7 +824,7 @@ func (q *findnodeQuery) start(net *Network) bool { type nodeEvent uint -//go:generate stringer -type=nodeEvent +//go:generate go run golang.org/x/tools/cmd/stringer -type=nodeEvent const ( invalidEvent nodeEvent = iota // zero is reserved diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 44d1c1b4d72ff..8a6cc1c4126a5 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -63,7 +63,7 @@ type btBlock struct { UncleHeaders []*btHeader } -//go:generate gencodec -type btHeader -field-override btHeaderMarshaling -out gen_btheader.go +//go:generate go run github.com/fjl/gencodec -type btHeader -field-override btHeaderMarshaling -out gen_btheader.go type btHeader struct { Bloom types.Bloom diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 71ee599b66cef..9b628fa2d616a 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -27,7 +27,7 @@ import ( "github.com/XinFinOrg/XDPoSChain/params" ) -//go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go +//go:generate go run github.com/fjl/gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go type DifficultyTest struct { ParentTimestamp *big.Int `json:"parentTimestamp"` diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 74f5fc33c47a2..45d4244d804c3 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -73,7 +73,7 @@ type stPostState struct { } } -//go:generate gencodec -type stEnv -field-override stEnvMarshaling -out gen_stenv.go +//go:generate go run github.com/fjl/gencodec -type stEnv -field-override stEnvMarshaling -out gen_stenv.go type stEnv struct { Coinbase common.Address `json:"currentCoinbase" gencodec:"required"` @@ -93,7 +93,7 @@ type stEnvMarshaling struct { BaseFee *math.HexOrDecimal256 } -//go:generate gencodec -type stTransaction -field-override stTransactionMarshaling -out gen_sttransaction.go +//go:generate go run github.com/fjl/gencodec -type stTransaction -field-override stTransactionMarshaling -out gen_sttransaction.go type stTransaction struct { GasPrice *big.Int `json:"gasPrice"` diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 1b889c7e3a97e..e64b74c9e6f2a 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -42,7 +42,7 @@ type ttJSON struct { Transaction *ttTransaction `json:"transaction"` } -//go:generate gencodec -type ttTransaction -field-override ttTransactionMarshaling -out gen_tttransaction.go +//go:generate go run github.com/fjl/gencodec -type ttTransaction -field-override ttTransactionMarshaling -out gen_tttransaction.go type ttTransaction struct { Data []byte `gencodec:"required"` diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index 0dfa4f634922d..8866168d52180 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -55,7 +55,7 @@ type vmJSON struct { PostStateRoot common.Hash `json:"postStateRoot"` } -//go:generate gencodec -type vmExec -field-override vmExecMarshaling -out gen_vmexec.go +//go:generate go run github.com/fjl/gencodec -type vmExec -field-override vmExecMarshaling -out gen_vmexec.go type vmExec struct { Address common.Address `json:"address" gencodec:"required"`