chore: lint

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
gnolang · Nov 29, 2023 · ab23990 · ab23990
1 parent a64c56e
commit ab23990
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/gnovm/cmd/gno/dev_node.go b/gnovm/cmd/gno/dev_node.go
@@ -28,6 +28,7 @@ var _ backup.Client = (*DevNode)(nil)
 // DevNode is a restore.Client
 var _ restore.Client = (*DevNode)(nil)
 
+// DevNode is not thread safe
 type DevNode struct {
  node *node.Node
 
@@ -215,14 +216,14 @@ func (d *DevNode) reset(genesis gnoland.GnoGenesisState) error {
  createNode := func() {
  defer recoverError()
 
- node, err := newNode(d.logger, d.rootdir, genesis)
- if err != nil {
- err = fmt.Errorf("unable to create node: %w", err)
+ node, nodeErr := newNode(d.logger, d.rootdir, genesis)
+ if nodeErr != nil {
+ err = fmt.Errorf("unable to create node: %w", nodeErr)
  return
  }
 
- if err := node.Start(); err != nil {
- err = fmt.Errorf("unable to start the node: %w", err)
+ if startErr := node.Start(); startErr != nil {
+ err = fmt.Errorf("unable to start the node: %w", startErr)
  return
  }
 

diff --git a/gnovm/cmd/gno/dev_rawterm.go b/gnovm/cmd/gno/dev_rawterm.go
@@ -111,27 +111,18 @@ type TaskWriter interface {
  WriteTask(task string, buf []byte) (n int, err error)
 }
 
-func (rt *RawTerm) enableTermMode() {
- rt.condTermMode.L.Lock()
- rt.termMode = true
- rt.fsin.Write([]byte{0}) // Release the key reader
- rt.condTermMode.L.Unlock()
-}
-
-func (rt *RawTerm) disableTermMode() {
- rt.condTermMode.L.Lock()
- rt.termMode = false
- rt.condTermMode.Broadcast()
- rt.condTermMode.L.Unlock()
-}
-
 func (rt *RawTerm) TermMode() <-chan string {
- rt.enableTermMode()
+ // rt.enableTermMode()
 
  rt.muTermMode.Lock()
+
+ // Create a new terminal.
+ // We assume that raw term has been initilize here
  t := term.NewTerminal(rt.fsin, "> ")
+
  // Override output with terminal one
  rt.taskWriter = &rawTermWriter{t}
+
  rt.muTermMode.Unlock()
 
  // Create line reader chan
@@ -149,8 +140,6 @@ func (rt *RawTerm) TermMode() <-chan string {
  close(rl)
 
  rt.muTermMode.Unlock()
-
- rt.disableTermMode()
  }
 
  go func() {
@@ -204,12 +193,6 @@ func (rt *RawTerm) read(buf []byte) (n int, err error) {
 
 func (rt *RawTerm) ReadKeyPress() (KeyPress, error) {
  for {
- rt.condTermMode.L.Lock()
- for rt.termMode {
- rt.condTermMode.Wait()
- }
- rt.condTermMode.L.Unlock()
-
  buf := make([]byte, 1)
  if _, err := rt.read(buf); err != nil {
  return KeyNone, err
@@ -224,7 +207,7 @@ type columnTermWriter struct {
 }
 
 func (r *columnTermWriter) Write(buf []byte) (n int, err error) {
- return r.WriteTask("", buf)
+ return r.WriteTask(".", buf)
 }
 
 func (r *columnTermWriter) WriteTask(left string, buf []byte) (n int, err error) {
@@ -256,10 +239,6 @@ func (r *columnTermWriter) WriteTask(left string, buf []byte) (n int, err error)
 }
 
 func (r *columnTermWriter) writeColumnLine(left string, line []byte) (n int, err error) {
- if left == "" {
- left = "."
- }
-
  // Write left column
  if n, err = fmt.Fprintf(r.writer, "%-15s | ", left); err != nil {
  return n, err