Removed dependecy on tmlibs/common

Author: jaekwon

Gopkg.lock

@@ -37,10 +37,6 @@
   name = "github.com/stretchr/testify"
   version = "1.2.1"
 
-[[constraint]]
-  name = "github.com/tendermint/tmlibs"
-  version = "0.9.0-rc1"
-
 [prune]
   go-tests = true
   unused-packages = true

Gopkg.toml

@@ -9,7 +9,6 @@ import (
 	"os"
 
 	"github.com/tendermint/go-amino"
-	cmn "github.com/tendermint/tmlibs/common"
 )
 
 func main() {
@@ -45,16 +44,16 @@ func main() {
 			return
 		}
 		bz := hexDecode(flgs.Arg(0))
-		fmt.Println(cmn.ColoredBytes(bz, cmn.Green, cmn.Blue))
+		fmt.Println(ColoredBytes(bz, Green, Blue))
 		return
 	}
 
 	// Parse struct Amino bytes.
 	bz := hexDecode(os.Args[1]) // Read input hex bytes.
-	fmt.Println(cmn.Yellow("## Root Struct (assumed)"))
-	s, n, err := scanStruct(bz, "", true)   // Assume that it's  struct.
-	s += cmn.Red(fmt.Sprintf("%X", bz[n:])) // Bytes remaining are red.
-	fmt.Println(cmn.Yellow("## Root Struct END"))
+	fmt.Println(Yellow("## Root Struct (assumed)"))
+	s, n, err := scanStruct(bz, "", true) // Assume that it's  struct.
+	s += Red(fmt.Sprintf("%X", bz[n:]))   // Bytes remaining are red.
+	fmt.Println(Yellow("## Root Struct END"))
 	fmt.Println(s, n, err) // Print color-encoded bytes s.
 }
 
@@ -98,7 +97,7 @@ func scanVarint(bz []byte, indent string) (s string, n int, err error) {
 		return
 	}
 	// s is the same either way.
-	s = cmn.Cyan(fmt.Sprintf("%X", bz[:n]))
+	s = Cyan(fmt.Sprintf("%X", bz[:n]))
 	fmt.Printf("%s%s (", indent, s)
 	if okI64 {
 		fmt.Printf("i64:%v ", i64)
@@ -116,7 +115,7 @@ func scan8Byte(bz []byte, indent string) (s string, n int, err error) {
 		return
 	}
 	n = 8
-	s = cmn.Blue(fmt.Sprintf("%X", bz[:8]))
+	s = Blue(fmt.Sprintf("%X", bz[:8]))
 	fmt.Printf("%s%s\n", indent, s)
 	return
 }
@@ -135,10 +134,10 @@ func scanByteLength(bz []byte, indent string) (s string, n int, err error) {
 		err = errors.New("EOF while reading byte-length delimited.")
 		return
 	}
-	s = cmn.Cyan(fmt.Sprintf("%X", bz[:_n]))
+	s = Cyan(fmt.Sprintf("%X", bz[:_n]))
 	slide(&bz, &n, _n)
 	// Read the remaining bytes.
-	s += cmn.Green(fmt.Sprintf("%X", bz[:length]))
+	s += Green(fmt.Sprintf("%X", bz[:length]))
 	slide(&bz, &n, length)
 	fmt.Printf("%s%s (%v bytes)\n", indent, s, length)
 	return
@@ -183,7 +182,7 @@ func scan4Byte(bz []byte, indent string) (s string, n int, err error) {
 		return
 	}
 	n = 4
-	s = cmn.Blue(fmt.Sprintf("%X", bz[:4]))
+	s = Blue(fmt.Sprintf("%X", bz[:4]))
 	fmt.Printf("%s%s\n", indent, s)
 	return
 }
@@ -210,7 +209,7 @@ func scanList(bz []byte, indent string) (s string, n int, err error) {
 		_n = 0
 		err = errors.New("error decoding list length (uvarint)")
 	}
-	s += cmn.Cyan(fmt.Sprintf("%X", bz[:_n]))
+	s += Cyan(fmt.Sprintf("%X", bz[:_n]))
 	if slide(&bz, &n, _n) && err != nil {
 		return
 	}
@@ -257,11 +256,11 @@ func scanInterface(bz []byte, indent string) (s string, n int, err error) {
 	}
 	pb3 := pb
 	if isNil {
-		s = cmn.Magenta("0000")
+		s = Magenta("0000")
 	} else if hasDb {
-		s = cmn.Magenta(fmt.Sprintf("%X%X", db.Bytes(), pb3.Bytes()))
+		s = Magenta(fmt.Sprintf("%X%X", db.Bytes(), pb3.Bytes()))
 	} else {
-		s = cmn.Magenta(fmt.Sprintf("%X", pb3.Bytes()))
+		s = Magenta(fmt.Sprintf("%X", pb3.Bytes()))
 	}
 	if isNil {
 		fmt.Printf("%s%s (nil interface)\n", indent, s)

cmd/aminoscan.go

@@ -0,0 +1,98 @@
+package main
+
+// NOTE: This is copied over from tendermint/tendermint/libs/common/colors.go
+// Do not edit this file without modifying the other.
+
+import (
+	"fmt"
+	"strings"
+)
+
+const (
+	ANSIReset      = "\x1b[0m"
+	ANSIBright     = "\x1b[1m"
+	ANSIDim        = "\x1b[2m"
+	ANSIUnderscore = "\x1b[4m"
+	ANSIBlink      = "\x1b[5m"
+	ANSIReverse    = "\x1b[7m"
+	ANSIHidden     = "\x1b[8m"
+
+	ANSIFgBlack   = "\x1b[30m"
+	ANSIFgRed     = "\x1b[31m"
+	ANSIFgGreen   = "\x1b[32m"
+	ANSIFgYellow  = "\x1b[33m"
+	ANSIFgBlue    = "\x1b[34m"
+	ANSIFgMagenta = "\x1b[35m"
+	ANSIFgCyan    = "\x1b[36m"
+	ANSIFgWhite   = "\x1b[37m"
+
+	ANSIBgBlack   = "\x1b[40m"
+	ANSIBgRed     = "\x1b[41m"
+	ANSIBgGreen   = "\x1b[42m"
+	ANSIBgYellow  = "\x1b[43m"
+	ANSIBgBlue    = "\x1b[44m"
+	ANSIBgMagenta = "\x1b[45m"
+	ANSIBgCyan    = "\x1b[46m"
+	ANSIBgWhite   = "\x1b[47m"
+)
+
+// color the string s with color 'color'
+// unless s is already colored
+func treat(s string, color string) string {
+	if len(s) > 2 && s[:2] == "\x1b[" {
+		return s
+	}
+	return color + s + ANSIReset
+}
+
+func treatAll(color string, args ...interface{}) string {
+	var parts []string
+	for _, arg := range args {
+		parts = append(parts, treat(fmt.Sprintf("%v", arg), color))
+	}
+	return strings.Join(parts, "")
+}
+
+func Black(args ...interface{}) string {
+	return treatAll(ANSIFgBlack, args...)
+}
+
+func Red(args ...interface{}) string {
+	return treatAll(ANSIFgRed, args...)
+}
+
+func Green(args ...interface{}) string {
+	return treatAll(ANSIFgGreen, args...)
+}
+
+func Yellow(args ...interface{}) string {
+	return treatAll(ANSIFgYellow, args...)
+}
+
+func Blue(args ...interface{}) string {
+	return treatAll(ANSIFgBlue, args...)
+}
+
+func Magenta(args ...interface{}) string {
+	return treatAll(ANSIFgMagenta, args...)
+}
+
+func Cyan(args ...interface{}) string {
+	return treatAll(ANSIFgCyan, args...)
+}
+
+func White(args ...interface{}) string {
+	return treatAll(ANSIFgWhite, args...)
+}
+
+func ColoredBytes(data []byte, textColor, bytesColor func(...interface{}) string) string {
+	s := ""
+	for _, b := range data {
+		if 0x21 <= b && b < 0x7F {
+			s += textColor(string(b))
+		} else {
+			s += bytesColor(fmt.Sprintf("%02X", b))
+		}
+	}
+	return s
+}