Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize api parameters #2002

Merged
merged 1 commit into from
Jul 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/api/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ func (f *blocksTxInfoForm) Validate(r *http.Request) error {
if f.BlockID > 0 {
f.BlockID--
}
if f.Count <= 0 {
f.Count = defaultPaginatorLimit
}

if f.Count > maxPaginatorLimit {
f.Count = maxPaginatorLimit
}
return nil
}

Expand Down Expand Up @@ -235,7 +242,7 @@ func getBlocksDetailedInfoHandler(w http.ResponseWriter, r *http.Request) {
for _, blockModel := range blocks {
blck, err := block.UnmarshallBlock(bytes.NewBuffer(blockModel.Data))
if err != nil {
logger.WithFields(log.Fields{"type": consts.UnmarshallingError, "error": err, "bolck_id": blockModel.ID}).Error("on unmarshalling block")
logger.WithFields(log.Fields{"type": consts.UnmarshallingError, "error": err, "block_id": blockModel.ID}).Error("on unmarshalling block")
errorResponse(w, err)
return
}
Expand Down
3 changes: 3 additions & 0 deletions packages/api/getuid.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ type getUIDResult struct {
KeyID string `json:"key_id,omitempty"`
Address string `json:"address,omitempty"`
NetworkID string `json:"network_id,omitempty"`
Cryptoer string `json:"cryptoer"`
Hasher string `json:"hasher"`
}

func getUIDHandler(w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -60,6 +62,7 @@ func getUIDHandler(w http.ResponseWriter, r *http.Request) {
errorResponse(w, err)
return
}
result.Cryptoer, result.Hasher = conf.Config.CryptoSettings.Cryptoer, conf.Config.CryptoSettings.Hasher

jsonResponse(w, result)
}
2 changes: 1 addition & 1 deletion packages/conf/conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ func IpfsHost() string {
return Config.IpfsConf.Host
}

// GetNodesAddr returns addreses of nodes
// GetNodesAddr returns address of nodes
func GetNodesAddr() []string {
return Config.BootNodes.NodesAddr[:]
}
Expand Down
21 changes: 21 additions & 0 deletions packages/conf/syspar/syspar.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,27 @@ func GetNumberOfNodes() int64 {
}

func GetNumberOfNodesFromDB(transaction *sqldb.DbTransaction) int64 {
var bk sqldb.BlockChain
f, err := bk.GetMaxBlock()
if err != nil || !f {
return 1
}
if bk.ConsensusMode == consts.CandidateNodeMode {
var candidate sqldb.CandidateNode
var total int64
pledgeAmount, err := sqldb.GetPledgeAmount()
if err != nil {
return 1
}
err = sqldb.GetDB(transaction).Table(candidate.TableName()).Where("deleted = 0 AND earnest_total >= ?", pledgeAmount).Limit(SysInt(NumberNodes)).Count(&total).Error
if err != nil {
return 1
}
if total < 1 {
total = 1
}
return total
}
sp := &sqldb.PlatformParameter{}
sp.GetTransaction(transaction, HonorNodes)
var honorNodes []map[string]any
Expand Down