cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

cobr-gen: Soft struct-map unmarshaling

Browse Source
This commit is contained in:
Łukasz Magiera 2020-01-21 17:05:10 +01:00
parent 7566d75aeb
commit 7c6a884980
2 changed files with 361 additions and 528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

311
cbor_gen.go
View File

@ -73,13 +73,14 @@ func (t *SealTicket) UnmarshalCBOR(r io.Reader) error {
return fmt.Errorf("cbor input should be of type map")
}
if extra != 2 {
return fmt.Errorf("cbor input had wrong number of fields")
if extra > cbg.MaxLength {
return fmt.Errorf("SealTicket: map struct too large (%d)", extra)
}
var name string
n := extra
// t.BlockHeight (uint64) (uint64)
for i := uint64(0); i < n; i++ {
{
sval, err := cbg.ReadString(br)
@ -90,9 +91,9 @@ func (t *SealTicket) UnmarshalCBOR(r io.Reader) error {
name = string(sval)
}
if name != "BlockHeight" {
return fmt.Errorf("expected struct map entry %s to be BlockHeight", name)
}
switch name {
// t.BlockHeight (uint64) (uint64)
case "BlockHeight":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -103,19 +104,7 @@ func (t *SealTicket) UnmarshalCBOR(r io.Reader) error {
}
t.BlockHeight = uint64(extra)
// t.TicketBytes ([]uint8) (slice)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "TicketBytes" {
return fmt.Errorf("expected struct map entry %s to be TicketBytes", name)
}
case "TicketBytes":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -132,9 +121,13 @@ func (t *SealTicket) UnmarshalCBOR(r io.Reader) error {
if _, err := io.ReadFull(br, t.TicketBytes); err != nil {
return err
}
default:
}
}
return nil
}
func (t *SealSeed) MarshalCBOR(w io.Writer) error {
if t == nil {
_, err := w.Write(cbg.CborNull)
@ -196,13 +189,14 @@ func (t *SealSeed) UnmarshalCBOR(r io.Reader) error {
return fmt.Errorf("cbor input should be of type map")
}
if extra != 2 {
return fmt.Errorf("cbor input had wrong number of fields")
if extra > cbg.MaxLength {
return fmt.Errorf("SealSeed: map struct too large (%d)", extra)
}
var name string
n := extra
// t.BlockHeight (uint64) (uint64)
for i := uint64(0); i < n; i++ {
{
sval, err := cbg.ReadString(br)
@ -213,9 +207,9 @@ func (t *SealSeed) UnmarshalCBOR(r io.Reader) error {
name = string(sval)
}
if name != "BlockHeight" {
return fmt.Errorf("expected struct map entry %s to be BlockHeight", name)
}
switch name {
// t.BlockHeight (uint64) (uint64)
case "BlockHeight":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -226,19 +220,7 @@ func (t *SealSeed) UnmarshalCBOR(r io.Reader) error {
}
t.BlockHeight = uint64(extra)
// t.TicketBytes ([]uint8) (slice)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "TicketBytes" {
return fmt.Errorf("expected struct map entry %s to be TicketBytes", name)
}
case "TicketBytes":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -255,9 +237,13 @@ func (t *SealSeed) UnmarshalCBOR(r io.Reader) error {
if _, err := io.ReadFull(br, t.TicketBytes); err != nil {
return err
}
default:
}
}
return nil
}
func (t *Piece) MarshalCBOR(w io.Writer) error {
if t == nil {
_, err := w.Write(cbg.CborNull)
@ -335,13 +321,14 @@ func (t *Piece) UnmarshalCBOR(r io.Reader) error {
return fmt.Errorf("cbor input should be of type map")
}
if extra != 3 {
return fmt.Errorf("cbor input had wrong number of fields")
if extra > cbg.MaxLength {
return fmt.Errorf("Piece: map struct too large (%d)", extra)
}
var name string
n := extra
// t.DealID (uint64) (uint64)
for i := uint64(0); i < n; i++ {
{
sval, err := cbg.ReadString(br)
@ -352,9 +339,9 @@ func (t *Piece) UnmarshalCBOR(r io.Reader) error {
name = string(sval)
}
if name != "DealID" {
return fmt.Errorf("expected struct map entry %s to be DealID", name)
}
switch name {
// t.DealID (uint64) (uint64)
case "DealID":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -365,19 +352,7 @@ func (t *Piece) UnmarshalCBOR(r io.Reader) error {
}
t.DealID = uint64(extra)
// t.Size (uint64) (uint64)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "Size" {
return fmt.Errorf("expected struct map entry %s to be Size", name)
}
case "Size":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -388,19 +363,7 @@ func (t *Piece) UnmarshalCBOR(r io.Reader) error {
}
t.Size = uint64(extra)
// t.CommP ([]uint8) (slice)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "CommP" {
return fmt.Errorf("expected struct map entry %s to be CommP", name)
}
case "CommP":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -417,9 +380,13 @@ func (t *Piece) UnmarshalCBOR(r io.Reader) error {
if _, err := io.ReadFull(br, t.CommP); err != nil {
return err
}
default:
}
}
return nil
}
func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if t == nil {
_, err := w.Write(cbg.CborNull)
@ -477,7 +444,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
return err
}
// t.Pieces ([]storage.Piece) (slice)
// t.Pieces ([]sealing.Piece) (slice)
if len("Pieces") > cbg.MaxLength {
return xerrors.Errorf("Value in field \"Pieces\" was too long")
}
@ -571,7 +538,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
return err
}
// t.Ticket (storage.SealTicket) (struct)
// t.Ticket (sealing.SealTicket) (struct)
if len("Ticket") > cbg.MaxLength {
return xerrors.Errorf("Value in field \"Ticket\" was too long")
}
@ -609,7 +576,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
}
}
// t.Seed (storage.SealSeed) (struct)
// t.Seed (sealing.SealSeed) (struct)
if len("Seed") > cbg.MaxLength {
return xerrors.Errorf("Value in field \"Seed\" was too long")
}
@ -705,13 +672,14 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
return fmt.Errorf("cbor input should be of type map")
}
if extra != 13 {
return fmt.Errorf("cbor input had wrong number of fields")
if extra > cbg.MaxLength {
return fmt.Errorf("SectorInfo: map struct too large (%d)", extra)
}
var name string
n := extra
// t.State (uint64) (uint64)
for i := uint64(0); i < n; i++ {
{
sval, err := cbg.ReadString(br)
@ -722,9 +690,9 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
name = string(sval)
}
if name != "State" {
return fmt.Errorf("expected struct map entry %s to be State", name)
}
switch name {
// t.State (uint64) (uint64)
case "State":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -735,19 +703,7 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
}
t.State = uint64(extra)
// t.SectorID (uint64) (uint64)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "SectorID" {
return fmt.Errorf("expected struct map entry %s to be SectorID", name)
}
case "SectorID":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -758,19 +714,7 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
}
t.SectorID = uint64(extra)
// t.Nonce (uint64) (uint64)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "Nonce" {
return fmt.Errorf("expected struct map entry %s to be Nonce", name)
}
case "Nonce":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -780,20 +724,8 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
return fmt.Errorf("wrong type for uint64 field")
}
t.Nonce = uint64(extra)
// t.Pieces ([]storage.Piece) (slice)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "Pieces" {
return fmt.Errorf("expected struct map entry %s to be Pieces", name)
}
// t.Pieces ([]sealing.Piece) (slice)
case "Pieces":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -821,19 +753,7 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
}
// t.CommD ([]uint8) (slice)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "CommD" {
return fmt.Errorf("expected struct map entry %s to be CommD", name)
}
case "CommD":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -851,19 +771,7 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
return err
}
// t.CommR ([]uint8) (slice)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "CommR" {
return fmt.Errorf("expected struct map entry %s to be CommR", name)
}
case "CommR":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -881,19 +789,7 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
return err
}
// t.Proof ([]uint8) (slice)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "Proof" {
return fmt.Errorf("expected struct map entry %s to be Proof", name)
}
case "Proof":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -910,20 +806,8 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
if _, err := io.ReadFull(br, t.Proof); err != nil {
return err
}
// t.Ticket (storage.SealTicket) (struct)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "Ticket" {
return fmt.Errorf("expected struct map entry %s to be Ticket", name)
}
// t.Ticket (sealing.SealTicket) (struct)
case "Ticket":
{
@ -933,19 +817,7 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
}
// t.PreCommitMessage (cid.Cid) (struct)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "PreCommitMessage" {
return fmt.Errorf("expected struct map entry %s to be PreCommitMessage", name)
}
case "PreCommitMessage":
{
@ -969,20 +841,8 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
}
}
// t.Seed (storage.SealSeed) (struct)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "Seed" {
return fmt.Errorf("expected struct map entry %s to be Seed", name)
}
// t.Seed (sealing.SealSeed) (struct)
case "Seed":
{
@ -992,19 +852,7 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
}
// t.CommitMessage (cid.Cid) (struct)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "CommitMessage" {
return fmt.Errorf("expected struct map entry %s to be CommitMessage", name)
}
case "CommitMessage":
{
@ -1029,19 +877,7 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
}
// t.FaultReportMsg (cid.Cid) (struct)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "FaultReportMsg" {
return fmt.Errorf("expected struct map entry %s to be FaultReportMsg", name)
}
case "FaultReportMsg":
{
@ -1066,19 +902,7 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
}
// t.LastErr (string) (string)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "LastErr" {
return fmt.Errorf("expected struct map entry %s to be LastErr", name)
}
case "LastErr":
{
sval, err := cbg.ReadString(br)
@ -1088,5 +912,10 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) error {
t.LastErr = string(sval)
}
default:
}
}
return nil
}

4
fsm.go
View File

@ -236,6 +236,10 @@ func planOne(ts ...func() (mut mutator, next api.SectorState)) func(events []sta
continue
}
if err, iserr := events[0].User.(error); iserr {
log.Warnf("sector %d got error event %T: %+v", state.SectorID, events[0].User, err)
}
events[0].User.(mutator).apply(state)
state.State = next
return nil