From 01740695cda7fe27c53f0fa078732fa5a15a88a5 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 9 Jan 2014 16:19:44 +0100 Subject: moved db to dev console --- db_query_interface.go | 113 ------------------------------------------------- dev_console.go | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 113 deletions(-) delete mode 100644 db_query_interface.go create mode 100644 dev_console.go diff --git a/db_query_interface.go b/db_query_interface.go deleted file mode 100644 index ec1d7feb5..000000000 --- a/db_query_interface.go +++ /dev/null @@ -1,113 +0,0 @@ -package main - -import ( - "fmt" - "bufio" - "strings" - "os" - "errors" - "encoding/hex" -) - -type DbInterface struct { - db *MemDatabase - trie *Trie -} - -func NewDBInterface() *DbInterface { - db, _ := NewMemDatabase() - trie := NewTrie(db, "") - - return &DbInterface{db: db, trie: trie} -} - -func (i *DbInterface) ValidateInput(action string, argumentLength int) error { - err := false - var expArgCount int - - switch { - case action == "update" && argumentLength != 2: - err = true - expArgCount = 2 - case action == "get" && argumentLength != 1: - err = true - expArgCount = 1 - case action == "dag" && argumentLength != 2: - err = true - expArgCount = 2 - } - - if err { - return errors.New(fmt.Sprintf("'%s' requires %d args, got %d", action, expArgCount, argumentLength)) - } else { - return nil - } -} - -func (i *DbInterface) ParseInput(input string) bool { - scanner := bufio.NewScanner(strings.NewReader(input)) - scanner.Split(bufio.ScanWords) - - count := 0 - var tokens []string - for scanner.Scan() { - count++ - tokens = append(tokens, scanner.Text()) - } - if err := scanner.Err(); err != nil { - fmt.Fprintln(os.Stderr, "reading input:", err) - } - - if len(tokens) == 0 { return true } - - err := i.ValidateInput(tokens[0], count-1) - if err != nil { - fmt.Println(err) - } else { - switch tokens[0] { - case "update": - i.trie.Update(tokens[1], tokens[2]) - - fmt.Println(hex.EncodeToString([]byte(i.trie.root))) - case "get": - fmt.Println(i.trie.Get(tokens[1])) - case "root": - fmt.Println(hex.EncodeToString([]byte(i.trie.root))) - case "rawroot": - fmt.Println(i.trie.root) - case "print": - i.db.Print() - case "dag": - fmt.Println(DaggerVerify(Big(tokens[1]), BigPow(2, 36), Big(tokens[2]))) - case "exit", "quit", "q": - return false - case "help": - fmt.Printf(`QUERY COMMANDS: -update KEY VALUE - Updates/Creates a new value for the given key -get KEY - Retrieves the given key -root - Prints the hex encoded merkle root -rawroot - Prints the raw merkle root -`) - default: - fmt.Println("Unknown command:", tokens[0]) - } - } - - return true -} - -func (i *DbInterface) Start() { - fmt.Printf("DB Query tool. Type (help) for help\n") - reader := bufio.NewReader(os.Stdin) - for { - fmt.Printf("db >>> ") - str, _, err := reader.ReadLine() - if err != nil { - fmt.Println("Error reading input", err) - } else { - if !i.ParseInput(string(str)) { - return - } - } - } -} diff --git a/dev_console.go b/dev_console.go new file mode 100644 index 000000000..65166c0c1 --- /dev/null +++ b/dev_console.go @@ -0,0 +1,115 @@ +package main + +import ( + "fmt" + "bufio" + "strings" + "os" + "errors" + "encoding/hex" +) + +type Console struct { + db *MemDatabase + trie *Trie +} + +func NewConsole() *Console { + db, _ := NewMemDatabase() + trie := NewTrie(db, "") + + return &Console{db: db, trie: trie} +} + +func (i *Console) ValidateInput(action string, argumentLength int) error { + err := false + var expArgCount int + + switch { + case action == "update" && argumentLength != 2: + err = true + expArgCount = 2 + case action == "get" && argumentLength != 1: + err = true + expArgCount = 1 + case action == "dag" && argumentLength != 2: + err = true + expArgCount = 2 + } + + if err { + return errors.New(fmt.Sprintf("'%s' requires %d args, got %d", action, expArgCount, argumentLength)) + } else { + return nil + } +} + +func (i *Console) ParseInput(input string) bool { + scanner := bufio.NewScanner(strings.NewReader(input)) + scanner.Split(bufio.ScanWords) + + count := 0 + var tokens []string + for scanner.Scan() { + count++ + tokens = append(tokens, scanner.Text()) + } + if err := scanner.Err(); err != nil { + fmt.Fprintln(os.Stderr, "reading input:", err) + } + + if len(tokens) == 0 { return true } + + err := i.ValidateInput(tokens[0], count-1) + if err != nil { + fmt.Println(err) + } else { + switch tokens[0] { + case "update": + i.trie.Update(tokens[1], tokens[2]) + + fmt.Println(hex.EncodeToString([]byte(i.trie.root))) + case "get": + fmt.Println(i.trie.Get(tokens[1])) + case "root": + fmt.Println(hex.EncodeToString([]byte(i.trie.root))) + case "rawroot": + fmt.Println(i.trie.root) + case "print": + i.db.Print() + case "dag": + fmt.Println(DaggerVerify(Big(tokens[1]), BigPow(2, 36), Big(tokens[2]))) + case "exit", "quit", "q": + return false + case "help": + fmt.Printf( "COMMANDS:\n"+ + "\033[1m= DB =\033[0m\n"+ + "update KEY VALUE - Updates/Creates a new value for the given key\n"+ + "get KEY - Retrieves the given key\n"+ + "root - Prints the hex encoded merkle root\n"+ + "rawroot - Prints the raw merkle root\n"+ + "\033[1m= Dagger =\033[0m\n"+ + "dag HASH NONCE - Verifies a nonce with the given hash with dagger\n") + default: + fmt.Println("Unknown command:", tokens[0]) + } + } + + return true +} + +func (i *Console) Start() { + fmt.Printf("Eth Console. Type (help) for help\n") + reader := bufio.NewReader(os.Stdin) + for { + fmt.Printf("eth >>> ") + str, _, err := reader.ReadLine() + if err != nil { + fmt.Println("Error reading input", err) + } else { + if !i.ParseInput(string(str)) { + return + } + } + } +} -- cgit v1.2.3