diff --git a/bin/golangci-lint b/bin/golangci-lint new file mode 100755 index 0000000000..74b53ce004 Binary files /dev/null and b/bin/golangci-lint differ diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go index c57add0656..f41322fc8b 100644 --- a/cmd/geth/dbcmd.go +++ b/cmd/geth/dbcmd.go @@ -760,11 +760,17 @@ func showMetaData(ctx *cli.Context) error { data = append(data, []string{"headHeader.Root", fmt.Sprintf("%v", h.Root)}) data = append(data, []string{"headHeader.Number", fmt.Sprintf("%d (%#x)", h.Number, h.Number)}) } - table := tablewriter.NewWriter(os.Stdout) - table.SetHeader([]string{"Field", "Value"}) - table.AppendBulk(data) - table.Render() - return nil + table.SetHeader([]string{"Key", "Value"}) + +for key, value := range stats { + table.Append([]string{key, fmt.Sprintf("%v", value)}) +} + +fmt.Println("Key\tValue") +for key, value := range stats { + fmt.Printf("%s\t%v\n", key, value) +} +return nil } func inspectAccount(db *triedb.Database, start uint64, end uint64, address common.Address, raw bool) error { diff --git a/core/rawdb/database_tablewriter_tinygo.go b/core/rawdb/database_tablewriter_tinygo.go index 2f8e456fd5..50bdd11aa4 100644 --- a/core/rawdb/database_tablewriter_tinygo.go +++ b/core/rawdb/database_tablewriter_tinygo.go @@ -206,3 +206,11 @@ func (t *Table) printRow(row []string, widths []int) { } fmt.Fprintln(t.out) } +package rawdb + +import "io" + +// TinyGo doesn't support table formatting; use minimal placeholder. +type Table struct{} + +func NewTableWriter(w io.Writer) *Table { return &Table{} } diff --git a/core/rawdb/database_tablewriter_unix.go b/core/rawdb/database_tablewriter_unix.go index 8bec5396e8..d407eb02e6 100644 --- a/core/rawdb/database_tablewriter_unix.go +++ b/core/rawdb/database_tablewriter_unix.go @@ -19,15 +19,13 @@ package rawdb -import ( - "io" +import "io" - "github.com/olekukonko/tablewriter" -) - -// Re-export the real tablewriter types and functions -type Table = tablewriter.Table - -func newTableWriter(w io.Writer) *Table { - return tablewriter.NewWriter(w) +// Table is a placeholder struct for manual table rendering. +type Table struct { + w io.Writer +} + +func NewTableWriter(w io.Writer) *Table { + return &Table{w: w} } diff --git a/e --short HEAD b/e --short HEAD new file mode 100644 index 0000000000..9dda1c2210 --- /dev/null +++ b/e --short HEAD @@ -0,0 +1,4 @@ + docs/fix-broken-links + docs/fix-readme-typo +* event/simplify-conditional + master