parser: implement whole-block parsing and publicize constructors
This commit is contained in:
parent
e3b5a9558d
commit
58e5f3e78b
|
@ -0,0 +1,47 @@
|
|||
package parser
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/gtank/ctxd/parser/internal/bytestring"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
type block struct {
|
||||
hdr *blockHeader
|
||||
vtx []*transaction
|
||||
}
|
||||
|
||||
func NewBlock() *block {
|
||||
return &block{}
|
||||
}
|
||||
|
||||
func (b *block) ParseFromSlice(data []byte) (rest []byte, err error) {
|
||||
hdr := NewBlockHeader()
|
||||
data, err = hdr.ParseFromSlice(data)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "parsing block header")
|
||||
}
|
||||
|
||||
s := bytestring.String(data)
|
||||
var txCount int
|
||||
if ok := s.ReadCompactSize(&txCount); !ok {
|
||||
return nil, errors.New("could not read tx_count")
|
||||
}
|
||||
data = []byte(s)
|
||||
|
||||
vtx := make([]*transaction, 0, txCount)
|
||||
for i := 0; len(data) > 0; i++ {
|
||||
tx := NewTransaction()
|
||||
data, err = tx.ParseFromSlice(data)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, fmt.Sprintf("parsing transaction %d", i))
|
||||
}
|
||||
vtx = append(vtx, tx)
|
||||
}
|
||||
|
||||
b.hdr = hdr
|
||||
b.vtx = vtx
|
||||
|
||||
return data, nil
|
||||
}
|
|
@ -79,7 +79,7 @@ func (hdr *rawBlockHeader) MarshalBinary() ([]byte, error) {
|
|||
return backing[:SER_BLOCK_HEADER_SIZE], nil
|
||||
}
|
||||
|
||||
func newBlockHeader() *blockHeader {
|
||||
func NewBlockHeader() *blockHeader {
|
||||
return &blockHeader{
|
||||
rawBlockHeader: new(rawBlockHeader),
|
||||
}
|
||||
|
|
|
@ -72,7 +72,7 @@ func TestBlockHeader(t *testing.T) {
|
|||
continue
|
||||
}
|
||||
|
||||
blockHeader := newBlockHeader()
|
||||
blockHeader := NewBlockHeader()
|
||||
_, err = blockHeader.ParseFromSlice(blockData)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
package parser
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
func TestBlockParser(t *testing.T) {
|
||||
testBlocks, err := os.Open("testdata/blocks")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer testBlocks.Close()
|
||||
|
||||
scan := bufio.NewScanner(testBlocks)
|
||||
for i := 0; scan.Scan(); i++ {
|
||||
blockDataHex := scan.Text()
|
||||
blockData, err := hex.DecodeString(blockDataHex)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
continue
|
||||
}
|
||||
|
||||
block := NewBlock()
|
||||
blockData, err = block.ParseFromSlice(blockData)
|
||||
if err != nil {
|
||||
t.Error(errors.Wrap(err, fmt.Sprintf("parsing block %d", i)))
|
||||
continue
|
||||
}
|
||||
|
||||
// Some basic sanity checks
|
||||
if block.hdr.Version != 4 {
|
||||
t.Error("Read wrong version in a test block.")
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
|
@ -394,7 +394,7 @@ func (tx *transaction) ParseFromSlice(data []byte) ([]byte, error) {
|
|||
return []byte(s), nil
|
||||
}
|
||||
|
||||
func newTransaction() *transaction {
|
||||
func NewTransaction() *transaction {
|
||||
return &transaction{
|
||||
rawTransaction: new(rawTransaction),
|
||||
}
|
||||
|
|
|
@ -179,7 +179,7 @@ func TestSproutTransactionParser(t *testing.T) {
|
|||
}
|
||||
|
||||
for i, tt := range zip143tests {
|
||||
tx := newTransaction()
|
||||
tx := NewTransaction()
|
||||
|
||||
rest, err := tx.ParseFromSlice(rawTxData[i])
|
||||
if err != nil {
|
||||
|
@ -685,7 +685,7 @@ func TestSaplingTransactionParser(t *testing.T) {
|
|||
}
|
||||
|
||||
for i, tt := range zip243tests {
|
||||
tx := newTransaction()
|
||||
tx := NewTransaction()
|
||||
|
||||
rest, err := tx.ParseFromSlice(rawTxData[i])
|
||||
if err != nil {
|
||||
|
|
Loading…
Reference in New Issue