From 97087fd36d70d89830b6ee076831705da5181e64 Mon Sep 17 00:00:00 2001 From: AstaFrode Date: Wed, 17 May 2023 16:51:13 +0800 Subject: [PATCH] Base chal (#53) * update QueryChallenge * update QueryUnverifyProof --- core/chain/audit.go | 7 ++++--- core/chain/chain.go | 2 +- core/chain/types.go | 7 +------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/core/chain/audit.go b/core/chain/audit.go index 8ebe80a..4ce567c 100644 --- a/core/chain/audit.go +++ b/core/chain/audit.go @@ -10,20 +10,21 @@ import ( "github.com/pkg/errors" ) -func (c *chainClient) QueryUnverifyProof() ([]AllProofInfo, error) { - var list []AllProofInfo +func (c *chainClient) QueryUnverifyProof() ([]ProofAssignmentInfo, error) { + var list []ProofAssignmentInfo key := createPrefixedKey(AUDIT, UNVERIFYPROOF) keys, err := c.api.RPC.State.GetKeysLatest(key) if err != nil { return list, errors.Wrap(err, "[GetKeysLatest]") } set, err := c.api.RPC.State.QueryStorageAtLatest(keys) + if err != nil { return list, errors.Wrap(err, "[QueryStorageAtLatest]") } for _, elem := range set { for _, change := range elem.Changes { - var data AllProofInfo + var data ProofAssignmentInfo if err := codec.Decode(change.StorageData, &data); err != nil { log.Println(err) continue diff --git a/core/chain/chain.go b/core/chain/chain.go index 46cd758..576fcae 100644 --- a/core/chain/chain.go +++ b/core/chain/chain.go @@ -83,7 +83,7 @@ type Chain interface { QueryTeeInfoList() ([]TeeWorkerInfo, error) // - QueryUnverifyProof() ([]AllProofInfo, error) + QueryUnverifyProof() ([]ProofAssignmentInfo, error) // Register is used to register OSS or BUCKET roles. Register(role string, puk []byte, income string, pledge uint64) (string, error) diff --git a/core/chain/types.go b/core/chain/types.go index 05de2c5..5bca540 100644 --- a/core/chain/types.go +++ b/core/chain/types.go @@ -289,17 +289,12 @@ type TeeWorkerInfo struct { StashAccount types.AccountID } -type ProveInfo struct { +type ProofAssignmentInfo struct { SnapShot MinerSnapShot IdleProve types.Bytes ServiceProve types.Bytes } -type AllProofInfo struct { - Acc types.AccountID - UnverifyProofList []ProveInfo -} - func CompareSlice(s1, s2 []byte) bool { if len(s1) != len(s2) { return false