Skip to content

GitLab

新注册的用户请输入邮箱并保存，随后登录邮箱激活账号。后续可直接使用邮箱登录！

Commit e4bf2ef6 authored by taifu yuan's avatar taifu yuan 🏸
Browse files
Options

lint

parent e43f9ce8
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 83 deletions
certmgr/cert_alias_manage_contract.go
View file @ e4bf2ef6
...@@ -287,89 +287,6 @@ func (r *CertManageRuntime) addAliasCore(txSimContext protocol.TxSimContext, ali ...@@ -287,89 +287,6 @@ func (r *CertManageRuntime) addAliasCore(txSimContext protocol.TxSimContext, ali
return err return err
} }
func (r *CertManageRuntime) FreezeAlias(txSimContext protocol.TxSimContext, params map[string][]byte) (
result []byte, err error) {
// get alias
names := string(params[paramNameAliases])
names = strings.TrimSpace(names)
if utils.IsAnyBlank(names) {
err = fmt.Errorf("freeze alias failed, alias name is nil")
r.log.Warn(err)
return nil, err
}
nameList := strings.Split(names, ",")
for _, name := range nameList {
certAliasInfo, err := r.getAliasFromDb(txSimContext, name)
if err != nil {
r.log.Error(err)
return nil, err
}
if certAliasInfo == nil {
err = fmt.Errorf("freeze alias failed, not found alias[%s], you should add alias first", name)
r.log.Warn(err)
return nil, err
}
//if certAliasInfo.Status != AliasStatusNormal.String() {
// err = fmt.Errorf("freeze alias failed, alias[%s] status[%s] is not normal", name, certAliasInfo.Status)
// r.log.Warn(err)
// return nil, err
//}
//// save status
//certAliasInfo.Status = AliasStatusFrozen.String()
err = r.setAliasToDb(txSimContext, certAliasInfo)
if err != nil {
return nil, err
}
r.log.Infof("freeze alias success, alias[%s]", name)
}
return []byte("ok"), nil
}
func (r *CertManageRuntime) UnfreezeAlias(txSimContext protocol.TxSimContext, params map[string][]byte) (
result []byte, err error) {
// get alias
names := string(params[paramNameAliases])
names = strings.TrimSpace(names)
if utils.IsAnyBlank(names) {
err = fmt.Errorf("unfreeze alias failed, alias name is nil")
r.log.Warn(err)
return nil, err
}
nameList := strings.Split(names, ",")
for _, name := range nameList {
certAliasInfo, err := r.getAliasFromDb(txSimContext, name)
if err != nil {
r.log.Error(err)
return nil, err
}
if certAliasInfo == nil {
err = fmt.Errorf("unfreeze alias failed, not found alias[%s], you should add alias first", name)
r.log.Warn(err)
return nil, err
}
//if certAliasInfo.Status == AliasStatusDeleted.String() {
// err = fmt.Errorf("freeze alias failed, alias[%s] has been deleted", name)
// r.log.Warn(err)
// return nil, err
//}
//if certAliasInfo.Status != AliasStatusFrozen.String() {
// err = fmt.Errorf("freeze alias failed, alias[%s] status[%s] is not frozen", name, certAliasInfo.Status)
// r.log.Warn(err)
// return nil, err
//}
//// save status
//certAliasInfo.Status = AliasStatusNormal.String()
err = r.setAliasToDb(txSimContext, certAliasInfo)
if err != nil {
return nil, err
}
r.log.Infof("unfreeze alias success, alias[%s]", name)
}
return []byte("ok"), nil
}
func (r *CertManageRuntime) QueryCertByAliasAndBlockHeight(txSimContext protocol.TxSimContext, func (r *CertManageRuntime) QueryCertByAliasAndBlockHeight(txSimContext protocol.TxSimContext,
params map[string][]byte) (result []byte, err error) { params map[string][]byte) (result []byte, err error) {
name := string(params[paramNameAlias]) name := string(params[paramNameAlias])
...@@ -480,6 +397,97 @@ func (r *CertManageRuntime) setCertHash(txSimContext protocol.TxSimContext, nowC ...@@ -480,6 +397,97 @@ func (r *CertManageRuntime) setCertHash(txSimContext protocol.TxSimContext, nowC
return nil return nil
} }
func (r *CertManageRuntime) FreezeAlias(txSimContext protocol.TxSimContext, params map[string][]byte) (
result []byte, err error) {
// get alias
names := string(params[paramNameAliases])
names = strings.TrimSpace(names)
if utils.IsAnyBlank(names) {
err = fmt.Errorf("freeze alias failed, alias name is nil")
r.log.Warn(err)
return nil, err
}
nameList := strings.Split(names, ",")
for _, name := range nameList {
certAliasInfo, err := r.getAliasFromDb(txSimContext, name)
if err != nil {
r.log.Error(err)
return nil, err
}
if certAliasInfo == nil {
err = fmt.Errorf("freeze alias failed, not found alias[%s], you should add alias first", name)
r.log.Warn(err)
return nil, err
}
//if certAliasInfo.Status != AliasStatusNormal.String() {
// err = fmt.Errorf("freeze alias failed, alias[%s] status[%s] is not normal", name, certAliasInfo.Status)
// r.log.Warn(err)
// return nil, err
//}
//// save status
//certAliasInfo.Status = AliasStatusFrozen.String()
err = r.setAliasToDb(txSimContext, certAliasInfo)
if err != nil {
return nil, err
}
err = r.addFreezeAliasArray(txSimContext, name)
if err != nil {
return nil, err
}
r.log.Infof("freeze alias success, alias[%s]", name)
}
return []byte("ok"), nil
}
func (r *CertManageRuntime) UnfreezeAlias(txSimContext protocol.TxSimContext, params map[string][]byte) (
result []byte, err error) {
// get alias
names := string(params[paramNameAliases])
names = strings.TrimSpace(names)
if utils.IsAnyBlank(names) {
err = fmt.Errorf("unfreeze alias failed, alias name is nil")
r.log.Warn(err)
return nil, err
}
nameList := strings.Split(names, ",")
for _, name := range nameList {
certAliasInfo, err := r.getAliasFromDb(txSimContext, name)
if err != nil {
r.log.Error(err)
return nil, err
}
if certAliasInfo == nil {
err = fmt.Errorf("unfreeze alias failed, not found alias[%s], you should add alias first", name)
r.log.Warn(err)
return nil, err
}
//if certAliasInfo.Status == AliasStatusDeleted.String() {
// err = fmt.Errorf("freeze alias failed, alias[%s] has been deleted", name)
// r.log.Warn(err)
// return nil, err
//}
//if certAliasInfo.Status != AliasStatusFrozen.String() {
// err = fmt.Errorf("freeze alias failed, alias[%s] status[%s] is not frozen", name, certAliasInfo.Status)
// r.log.Warn(err)
// return nil, err
//}
//// save status
//certAliasInfo.Status = AliasStatusNormal.String()
err = r.setAliasToDb(txSimContext, certAliasInfo)
if err != nil {
return nil, err
}
err = r.removeFreezeAliasArray(txSimContext, name)
if err != nil {
return nil, err
}
r.log.Infof("unfreeze alias success, alias[%s]", name)
}
return []byte("ok"), nil
}
func (r *CertManageRuntime) addFreezeAliasArray(txSimContext protocol.TxSimContext, alias string) error { func (r *CertManageRuntime) addFreezeAliasArray(txSimContext protocol.TxSimContext, alias string) error {
aliases, err := r.getFreezeAliasArray(txSimContext) aliases, err := r.getFreezeAliasArray(txSimContext)
if err != nil { if err != nil {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © 2021 ChainMaker Org. All Rights Reserved. 长安链 版权所有。