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 f5bfaff003
commit 2076cb106d
9 changed files with 590 additions and 799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
api/cbor_gen.go
View File

@ -98,13 +98,14 @@ func (t *PaymentInfo) 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("PaymentInfo: map struct too large (%d)", extra)
}
var name string
n := extra
// t.Channel (address.Address) (struct)
for i := uint64(0); i < n; i++ {
{
sval, err := cbg.ReadString(br)
@ -115,9 +116,9 @@ func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) error {
name = string(sval)
}
if name != "Channel" {
return fmt.Errorf("expected struct map entry %s to be Channel", name)
}
switch name {
// t.Channel (address.Address) (struct)
case "Channel":
{
@ -127,19 +128,7 @@ func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) error {
}
// t.ChannelMessage (cid.Cid) (struct)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "ChannelMessage" {
return fmt.Errorf("expected struct map entry %s to be ChannelMessage", name)
}
case "ChannelMessage":
{
@ -164,19 +153,7 @@ func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) error {
}
// t.Vouchers ([]*types.SignedVoucher) (slice)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "Vouchers" {
return fmt.Errorf("expected struct map entry %s to be Vouchers", name)
}
case "Vouchers":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -203,9 +180,12 @@ func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) error {
t.Vouchers[i] = &v
}
return nil
default:
}
}
return nil
}
func (t *SealedRef) MarshalCBOR(w io.Writer) error {
if t == nil {
_, err := w.Write(cbg.CborNull)
@ -276,13 +256,14 @@ func (t *SealedRef) 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("SealedRef: map struct too large (%d)", extra)
}
var name string
n := extra
// t.SectorID (uint64) (uint64)
for i := uint64(0); i < n; i++ {
{
sval, err := cbg.ReadString(br)
@ -293,9 +274,9 @@ func (t *SealedRef) UnmarshalCBOR(r io.Reader) error {
name = string(sval)
}
if name != "SectorID" {
return fmt.Errorf("expected struct map entry %s to be SectorID", name)
}
switch name {
// t.SectorID (uint64) (uint64)
case "SectorID":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -306,19 +287,7 @@ func (t *SealedRef) UnmarshalCBOR(r io.Reader) error {
}
t.SectorID = uint64(extra)
// t.Offset (uint64) (uint64)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "Offset" {
return fmt.Errorf("expected struct map entry %s to be Offset", name)
}
case "Offset":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -329,19 +298,7 @@ func (t *SealedRef) UnmarshalCBOR(r io.Reader) error {
}
t.Offset = 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 {
@ -351,9 +308,13 @@ func (t *SealedRef) UnmarshalCBOR(r io.Reader) error {
return fmt.Errorf("wrong type for uint64 field")
}
t.Size = uint64(extra)
return nil
default:
}
}
return nil
}
func (t *SealedRefs) MarshalCBOR(w io.Writer) error {
if t == nil {
_, err := w.Write(cbg.CborNull)
@ -401,13 +362,14 @@ func (t *SealedRefs) UnmarshalCBOR(r io.Reader) error {
return fmt.Errorf("cbor input should be of type map")
}
if extra != 1 {
return fmt.Errorf("cbor input had wrong number of fields")
if extra > cbg.MaxLength {
return fmt.Errorf("SealedRefs: map struct too large (%d)", extra)
}
var name string
n := extra
// t.Refs ([]api.SealedRef) (slice)
for i := uint64(0); i < n; i++ {
{
sval, err := cbg.ReadString(br)
@ -418,9 +380,9 @@ func (t *SealedRefs) UnmarshalCBOR(r io.Reader) error {
name = string(sval)
}
if name != "Refs" {
return fmt.Errorf("expected struct map entry %s to be Refs", name)
}
switch name {
// t.Refs ([]api.SealedRef) (slice)
case "Refs":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -447,5 +409,9 @@ func (t *SealedRefs) UnmarshalCBOR(r io.Reader) error {
t.Refs[i] = v
}
default:
}
}
return nil
}

1
api/test/deals.go
View File

@ -65,7 +65,6 @@ func TestDealFlow(t *testing.T, b APIBuilder, blocktime time.Duration) {
defer close(done)
for mine {
time.Sleep(blocktime)
fmt.Println("mining a block now")
if err := sn[0].MineOne(ctx); err != nil {
t.Error(err)
}

2
gen/main.go
View File

@ -122,7 +122,7 @@ func main() {
os.Exit(1)
}
err = gen.WriteMapEncodersToFile("./storage/sectors/cbor_gen.go", "sectors",
err = gen.WriteMapEncodersToFile("./storage/sealing/cbor_gen.go", "sealing",
sealing.SealTicket{},
sealing.SealSeed{},
sealing.Piece{},

2
go.mod
View File

@ -86,7 +86,7 @@ require (
github.com/prometheus/common v0.2.0
github.com/stretchr/testify v1.4.0
github.com/whyrusleeping/bencher v0.0.0-20190829221104-bb6607aa8bba
github.com/whyrusleeping/cbor-gen v0.0.0-20200106232624-282db0d37dbe
github.com/whyrusleeping/cbor-gen v0.0.0-20200121160201-1834514787d2
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
github.com/whyrusleeping/pubsub v0.0.0-20131020042734-02de8aa2db3d
go.opencensus.io v0.22.2

4
go.sum
View File

@ -711,8 +711,8 @@ github.com/whyrusleeping/cbor-gen v0.0.0-20190917003517-d78d67427694/go.mod h1:x
github.com/whyrusleeping/cbor-gen v0.0.0-20191116002219-891f55cd449d/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
github.com/whyrusleeping/cbor-gen v0.0.0-20191212224538-d370462a7e8a/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
github.com/whyrusleeping/cbor-gen v0.0.0-20191216205031-b047b6acb3c0/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
github.com/whyrusleeping/cbor-gen v0.0.0-20200106232624-282db0d37dbe h1:n7En1uyDtknjLRDXebWlPGJoHvwL8AkNcSQzuOoYYYQ=
github.com/whyrusleeping/cbor-gen v0.0.0-20200106232624-282db0d37dbe/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
github.com/whyrusleeping/cbor-gen v0.0.0-20200121160201-1834514787d2 h1:VwJlCmEiu+/sl5KUq5w4i5VrhTIAhI++GVHGWf+vGnc=
github.com/whyrusleeping/cbor-gen v0.0.0-20200121160201-1834514787d2/go.mod h1:xdlJQaiqipF0HW+Mzpg7XRM3fWbGvfgFlcppuvlkIvY=
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E=
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8=
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=

65
lib/statemachine/cbor_gen.go
View File

@ -66,13 +66,14 @@ func (t *TestState) 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("TestState: map struct too large (%d)", extra)
}
var name string
n := extra
// t.A (uint64) (uint64)
for i := uint64(0); i < n; i++ {
{
sval, err := cbg.ReadString(br)
@ -83,9 +84,9 @@ func (t *TestState) UnmarshalCBOR(r io.Reader) error {
name = string(sval)
}
if name != "A" {
return fmt.Errorf("expected struct map entry %s to be A", name)
}
switch name {
// t.A (uint64) (uint64)
case "A":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -96,19 +97,7 @@ func (t *TestState) UnmarshalCBOR(r io.Reader) error {
}
t.A = uint64(extra)
// t.B (uint64) (uint64)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "B" {
return fmt.Errorf("expected struct map entry %s to be B", name)
}
case "B":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -118,9 +107,13 @@ func (t *TestState) UnmarshalCBOR(r io.Reader) error {
return fmt.Errorf("wrong type for uint64 field")
}
t.B = uint64(extra)
return nil
default:
}
}
return nil
}
func (t *TestEvent) MarshalCBOR(w io.Writer) error {
if t == nil {
_, err := w.Write(cbg.CborNull)
@ -182,13 +175,14 @@ func (t *TestEvent) 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("TestEvent: map struct too large (%d)", extra)
}
var name string
n := extra
// t.A (string) (string)
for i := uint64(0); i < n; i++ {
{
sval, err := cbg.ReadString(br)
@ -199,9 +193,9 @@ func (t *TestEvent) UnmarshalCBOR(r io.Reader) error {
name = string(sval)
}
if name != "A" {
return fmt.Errorf("expected struct map entry %s to be A", name)
}
switch name {
// t.A (string) (string)
case "A":
{
sval, err := cbg.ReadString(br)
@ -212,19 +206,7 @@ func (t *TestEvent) UnmarshalCBOR(r io.Reader) error {
t.A = string(sval)
}
// t.Val (uint64) (uint64)
{
sval, err := cbg.ReadString(br)
if err != nil {
return err
}
name = string(sval)
}
if name != "Val" {
return fmt.Errorf("expected struct map entry %s to be Val", name)
}
case "Val":
maj, extra, err = cbg.CborReadHeader(br)
if err != nil {
@ -234,5 +216,10 @@ func (t *TestEvent) UnmarshalCBOR(r io.Reader) error {
return fmt.Errorf("wrong type for uint64 field")
}
t.Val = uint64(extra)
default:
}
}
return nil
}

6
node/node_test.go
View File

@ -393,6 +393,12 @@ func TestAPIRPC(t *testing.T) {
}
func TestAPIDealFlow(t *testing.T) {
logging.SetLogLevel("miner", "ERROR")
logging.SetLogLevel("chainstore", "ERROR")
logging.SetLogLevel("chain", "ERROR")
logging.SetLogLevel("sub", "ERROR")
logging.SetLogLevel("storageminer", "ERROR")
test.TestDealFlow(t, mockSbBuilder, 10*time.Millisecond)
}

311
storage/sealing/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
}
return nil
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
}
return nil
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
}
return nil
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
storage/sealing/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