Skip to content

Commit 4401839

Browse files
committed
fix datatranfer
1 parent dc1f67a commit 4401839

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

cmd/migrate-curio/migrate.go

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -257,20 +257,25 @@ func migrateBoostDeals(ctx context.Context, activeSectors bitfield.BitField, mad
257257
return err
258258
}
259259

260-
// de-serialize transport opaque token
261260
tInfo := &transportTypes.HttpRequest{}
262-
if err := json.Unmarshal(deal.Transfer.Params, tInfo); err != nil {
263-
return fmt.Errorf("deal: %s: failed to de-serialize transport params bytes '%s': %s", deal.DealUuid.String(), string(deal.Transfer.Params), err)
264-
}
261+
var headers []byte
262+
if !deal.IsOffline {
263+
// de-serialize transport opaque token
264+
if err := json.Unmarshal(deal.Transfer.Params, tInfo); err != nil {
265+
return fmt.Errorf("deal: %s: failed to de-serialize transport params bytes '%s': %s", deal.DealUuid.String(), string(deal.Transfer.Params), err)
266+
}
265267

266-
hdr := http.Header{}
267-
for k, v := range tInfo.Headers {
268-
hdr.Add(k, v)
269-
}
268+
goheaders := http.Header{}
269+
for k, v := range tInfo.Headers {
270+
goheaders.Set(k, v)
271+
}
270272

271-
headers, err := json.Marshal(hdr)
272-
if err != nil {
273-
return fmt.Errorf("deal: %s: failed to marshal headers: %s", deal.DealUuid.String(), err)
273+
headers, err = json.Marshal(goheaders)
274+
if err != nil {
275+
return fmt.Errorf("deal: %s: failed to marshal headers: %s", deal.DealUuid.String(), err)
276+
}
277+
} else {
278+
headers = []byte("{}")
274279
}
275280

276281
// Cbor marshal the Deal Label manually as non-string label will result in "" with JSON marshal
@@ -408,7 +413,7 @@ func migrateLegacyDeals(ctx context.Context, full v1api.FullNode, activeSectors
408413
if i > 0 && i%100 == 0 {
409414
fmt.Printf("Migrating Legacy Deals: %d / %d (%0.2f%%)\n", i, len(legacyDeals), float64(i)/float64(len(legacyDeals))*100)
410415
}
411-
llog := log.With("Boost Deal", deal.ProposalCid.String())
416+
llog := log.With("Legacy Deal", deal.ProposalCid.String())
412417
// Skip deals which do not have chain deal ID
413418
if deal.DealID == 0 {
414419
llog.Infow("Skipping as chain deal ID is 0")

0 commit comments

Comments
 (0)