forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-16 18:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #806 from gzliudan/migrate_to_embed

Browse source 
all: migrate go-bindata to embed
This commit is contained in:
Daniel Liu 2025-01-22 19:24:20 +08:00 committed by GitHub
commit bc2f68d70b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 590 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmd/faucet/faucet.go
View file

@ -17,12 +17,10 @@
// faucet is a Ether faucet backed by a light client. // faucet is a Ether faucet backed by a light client.
package main package main
//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 ( import (
"bytes" "bytes"
"context" "context"
_ "embed"
"encoding/json" "encoding/json"
"errors" "errors"
"flag" "flag"
@ -91,6 +89,9 @@ var (
ether = new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil) ether = new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil)
) )
//go:embed faucet.html
var websiteTmpl string
func main() { func main() {
// Parse the flags and set up the logger to print everything requested // Parse the flags and set up the logger to print everything requested
flag.Parse() flag.Parse()
@ -122,13 +123,8 @@ func main() {
periods[i] = strings.TrimSuffix(periods[i], "s") periods[i] = strings.TrimSuffix(periods[i], "s")
} }
} }
// Load up and render the faucet website
tmpl, err := Asset("faucet.html")
if err != nil {
log.Crit("Failed to load the faucet template", "err", err)
}
website := new(bytes.Buffer) website := new(bytes.Buffer)
err = template.Must(template.New("").Parse(string(tmpl))).Execute(website, map[string]interface{}{ err := template.Must(template.New("").Parse(websiteTmpl)).Execute(website, map[string]interface{}{
"Network": *netnameFlag, "Network": *netnameFlag,
"Amounts": amounts, "Amounts": amounts,
"Periods": periods, "Periods": periods,

276
cmd/faucet/website.go
View file

File diff suppressed because one or more lines are too long

6
console/console.go
View file

@ -157,12 +157,10 @@ func (c *Console) initConsoleObject() {
} }
func (c *Console) initWeb3(bridge *bridge) error { func (c *Console) initWeb3(bridge *bridge) error {
bnJS := string(deps.MustAsset("bignumber.js")) if err := c.jsre.Compile("bignumber.js", deps.BigNumberJS); err != nil {
web3JS := string(deps.MustAsset("web3.js"))
if err := c.jsre.Compile("bignumber.js", bnJS); err != nil {
return fmt.Errorf("bignumber.js: %v", err) return fmt.Errorf("bignumber.js: %v", err)
} }
if err := c.jsre.Compile("web3.js", web3JS); err != nil { if err := c.jsre.Compile("web3.js", deps.Web3JS); err != nil {
return fmt.Errorf("web3.js: %v", err) return fmt.Errorf("web3.js: %v", err)
} }
if _, err := c.jsre.Run("var Web3 = require('web3');"); err != nil { if _, err := c.jsre.Run("var Web3 = require('web3');"); err != nil {

299
internal/jsre/deps/bindata.go
View file

File diff suppressed because one or more lines are too long

11
internal/jsre/deps/deps.go
View file

@ -17,5 +17,12 @@
// Package deps contains the console JavaScript dependencies Go embedded. // Package deps contains the console JavaScript dependencies Go embedded.
package deps package deps
//go:generate go run github.com/kevinburke/go-bindata/go-bindata -nometadata -pkg deps -o bindata.go bignumber.js web3.js import (
//go:generate gofmt -w -s bindata.go _ "embed"
)
//go:embed web3.js
var Web3JS string
//go:embed bignumber.js
var BigNumberJS string