fix QueryDealMap (#14)

CESSProject · Apr 11, 2023 · 424f616 · 424f616
1 parent 9d2fd21
commit 424f616
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/core/chain/state.go b/core/chain/state.go
@@ -478,6 +478,20 @@ func (c *chainClient) QueryStorageOrder(roothash string) (StorageOrder, error) {
 		}
 	}()
 	var data StorageOrder
+	var hash FileHash
+
+	if len(hash) != len(roothash) {
+		return data, errors.New("invalid filehash")
+	}
+
+	for i := 0; i < len(hash); i++ {
+		hash[i] = types.U8(roothash[i])
+	}
+
+	b, err := codec.Encode(hash)
+	if err != nil {
+		return data, errors.Wrap(err, "[Encode]")
+	}
 
 	if !c.IsChainClientOk() {
 		c.SetChainState(false)
@@ -489,6 +503,7 @@ func (c *chainClient) QueryStorageOrder(roothash string) (StorageOrder, error) {
 		c.metadata,
 		FILEBANK,
 		DEALMAP,
+		b,
 	)
 	if err != nil {
 		return data, errors.Wrap(err, "[CreateStorageKey]")

diff --git a/core/chain/types.go b/core/chain/types.go
@@ -201,8 +201,8 @@ type FragmentList struct {
 
 type StorageOrder struct {
 	Stage         types.U8
-	SegmentList   SegmentList
-	NeededList    SegmentList
+	SegmentList   []SegmentList
+	NeededList    []SegmentList
 	User          UserBrief
 	AssignedMiner []MinerTaskList
 	ShareInfo     []SegmentInfo