add missing tests, empty (stubs) for now

cmd/ingest/ingest_test.go

@@ -0,0 +1,8 @@
+package main
+
+import (
+	"testing"
+)
+
+func TestString_read(t *testing.T) {
+}

cmd/ingest/main.go

@@ -98,16 +98,7 @@ func main() {
 	if err != nil {
 		log.WithFields(logrus.Fields{
 			"error": err,
-		}).Warn("zcash.conf failed, will try empty credentials for rpc")
-
-		//Default to testnet, but user MUST specify rpcuser and rpcpassword in zcash.conf; no default
-		rpcClient, err = frontend.NewZRPCFromCreds("127.0.0.1:18232", "", "")
-
-		if err != nil {
-			log.WithFields(logrus.Fields{
-				"error": err,
-			}).Fatal("couldn't start rpc connection")
-		}
+		}).Fatal("setting up RPC connection to zcashd")
 	}
 
 	ctx := context.Background()

cmd/server/main.go

@@ -179,15 +179,7 @@ func main() {
 	if err != nil {
 		log.WithFields(logrus.Fields{
 			"error": err,
-		}).Warn("zcash.conf failed, will try empty credentials for rpc")
-
-		rpcClient, err = frontend.NewZRPCFromCreds("127.0.0.1:8232", "", "")
-
-		if err != nil {
-			log.WithFields(logrus.Fields{
-				"error": err,
-			}).Warn("couldn't start rpc conn. won't be able to send transactions")
-		}
+		}).Fatal("setting up RPC connection to zcashd")
 	}
 
 	// Compact transaction service initialization

cmd/server/server_test.go

@@ -0,0 +1,8 @@
+package main
+
+import (
+	"testing"
+)
+
+func TestString_read(t *testing.T) {
+}

frontend/frontend_test.go

@@ -0,0 +1,8 @@
+package frontend
+
+import (
+	"testing"
+)
+
+func TestString_read(t *testing.T) {
+}

frontend/rpc_client.go

@@ -19,13 +19,9 @@ func NewZRPCFromConf(confPath string) (*rpcclient.Client, error) {
 	username := cfg.Section("").Key("rpcuser").String()
 	password := cfg.Section("").Key("rpcpassword").String()
 
-	return NewZRPCFromCreds(net.JoinHostPort(rpcaddr, rpcport), username, password)
-}
-
-func NewZRPCFromCreds(addr, username, password string) (*rpcclient.Client, error) {
 	// Connect to local Zcash RPC server using HTTP POST mode.
 	connCfg := &rpcclient.ConnConfig{
-		Host:         addr,
+		Host:         net.JoinHostPort(rpcaddr, rpcport),
 		User:         username,
 		Pass:         password,
 		HTTPPostMode: true, // Zcash only supports HTTP POST mode

parser/block_test.go

@@ -42,6 +42,10 @@ func TestBlockParser(t *testing.T) {
 			t.Error("Read wrong version in a test block.")
 			break
 		}
+		if block.GetVersion() != 4 {
+			t.Error("Read wrong version in a test block.")
+			break
+		}
 
 		if block.GetTxCount() < 1 {
 			t.Error("No transactions in block")
@@ -90,6 +94,7 @@ func TestCompactBlocks(t *testing.T) {
 	type compactTest struct {
 		BlockHeight int    `json:"block"`
 		BlockHash   string `json:"hash"`
+		PrevHash    string `json:"prev"`
 		Full        string `json:"full"`
 		Compact     string `json:"compact"`
 	}

parser/internal/bytestring/bytestring.go

@@ -3,7 +3,6 @@
 package bytestring
 
 import (
-	"errors"
 	"io"
 )
 
@@ -45,9 +44,7 @@ func (s *String) Read(p []byte) (n int, err error) {
 	}
 
 	n = copy(p, *s)
-	if !s.Skip(n) {
-		return 0, errors.New("unexpected end of bytestring read")
-	}
+	s.Skip(n)
 	return n, nil
 }
 
@@ -58,7 +55,11 @@ func (s *String) Empty() bool {
 
 // Skip advances the string by n bytes and reports whether it was successful.
 func (s *String) Skip(n int) bool {
-	return s.read(n) != nil
+	if len(*s) < n {
+		return false
+	}
+	(*s) = (*s)[n:]
+	return true
 }
 
 // ReadByte reads a single byte into out and advances over it. It reports if
@@ -87,6 +88,7 @@ func (s *String) ReadBytes(out *[]byte, n int) bool {
 // encoding used for length-prefixing and count values. If the values fall
 // outside the expected canonical ranges, it returns false.
 func (s *String) ReadCompactSize(size *int) bool {
+	*size = 0
 	lenBytes := s.read(1)
 	if lenBytes == nil {
 		return false
@@ -106,8 +108,10 @@ func (s *String) ReadCompactSize(size *int) bool {
 		lenLen = 4
 		minSize = 0x10000
 	case lenByte == 255:
-		lenLen = 8
-		minSize = 0x100000000
+		// this case is not currently usable, beyond maxCompactSize;
+        // also, this is not possible if sizeof(int) is 4 bytes
+		//     lenLen = 8; minSize = 0x100000000
+		return false
 	}
 
 	if lenLen > 0 {
@@ -122,7 +126,6 @@ func (s *String) ReadCompactSize(size *int) bool {
 	if length > maxCompactSize || length < minSize {
 		return false
 	}
-
 	*size = int(length)
 	return true
 }
@@ -131,7 +134,7 @@ func (s *String) ReadCompactSize(size *int) bool {
 // length field into out. It reports whether the read was successful.
 func (s *String) ReadCompactLengthPrefixed(out *String) bool {
 	var length int
-	if ok := s.ReadCompactSize(&length); !ok {
+	if !s.ReadCompactSize(&length) {
 		return false
 	}
 
@@ -148,7 +151,7 @@ func (s *String) ReadCompactLengthPrefixed(out *String) bool {
 // signed, and advances over it. It reports whether the read was successful.
 func (s *String) ReadInt32(out *int32) bool {
 	var tmp uint32
-	if ok := s.ReadUint32(&tmp); !ok {
+	if !s.ReadUint32(&tmp) {
 		return false
 	}
 
@@ -160,7 +163,7 @@ func (s *String) ReadInt32(out *int32) bool {
 // signed, and advances over it. It reports whether the read was successful.
 func (s *String) ReadInt64(out *int64) bool {
 	var tmp uint64
-	if ok := s.ReadUint64(&tmp); !ok {
+	if !s.ReadUint64(&tmp) {
 		return false
 	}
 
@@ -175,7 +178,11 @@ func (s *String) ReadUint16(out *uint16) bool {
 	if v == nil {
 		return false
 	}
-	*out = uint16(v[0]) | uint16(v[1])<<8
+	*out = 0
+	for i := 1; i >= 0; i-- {
+		*out <<= 8
+		*out |= uint16(v[i])
+	}
 	return true
 }
 
@@ -186,7 +193,11 @@ func (s *String) ReadUint32(out *uint32) bool {
 	if v == nil {
 		return false
 	}
-	*out = uint32(v[0]) | uint32(v[1])<<8 | uint32(v[2])<<16 | uint32(v[3])<<24
+	*out = 0
+	for i := 3; i >= 0; i-- {
+		*out <<= 8
+		*out |= uint32(v[i])
+	}
 	return true
 }
 
@@ -197,8 +208,11 @@ func (s *String) ReadUint64(out *uint64) bool {
 	if v == nil {
 		return false
 	}
-	*out = uint64(v[0]) | uint64(v[1])<<8 | uint64(v[2])<<16 | uint64(v[3])<<24 |
-		uint64(v[4])<<32 | uint64(v[5])<<40 | uint64(v[6])<<48 | uint64(v[7])<<56
+	*out = 0
+	for i := 7; i >= 0; i-- {
+		*out <<= 8
+		*out |= uint64(v[i])
+	}
 	return true
 }
 
@@ -213,6 +227,7 @@ func (s *String) ReadUint64(out *uint64) bool {
 func (s *String) ReadScriptInt64(num *int64) bool {
 	// First byte is either an integer opcode, or the number of bytes in the
 	// number.
+	*num = 0
 	firstBytes := s.read(1)
 	if firstBytes == nil {
 		return false

parser/internal/bytestring/bytestring_test.go

@@ -0,0 +1,8 @@
+package bytestring
+
+import (
+	"testing"
+)
+
+func TestString(t *testing.T) {
+}

storage/sqlite3_test.go

@@ -21,6 +21,7 @@ import (
 type compactTest struct {
 	BlockHeight int    `json:"block"`
 	BlockHash   string `json:"hash"`
+	PrevHash    string `json:"prev"`
 	Full        string `json:"full"`
 	Compact     string `json:"compact"`
 }
@@ -66,7 +67,7 @@ func TestSqliteStorage(t *testing.T) {
 			protoBlock := block.ToCompact()
 			marshaled, _ := proto.Marshal(protoBlock)
 
-			err = StoreBlock(db, height, hash, hasSapling, marshaled)
+			err = StoreBlock(db, height, test.PrevHash, hash, hasSapling, marshaled)
 			if err != nil {
 				t.Error(err)
 				continue

walletrpc/walletrpc_test.go

@@ -0,0 +1,8 @@
+package walletrpc
+
+import (
+	"testing"
+)
+
+func TestString_read(t *testing.T) {
+}