Commit 5886042f authored by vipwzw's avatar vipwzw

auto ci

parent 09366cfa
...@@ -6,11 +6,12 @@ package main ...@@ -6,11 +6,12 @@ package main
import ( import (
"fmt" "fmt"
log "github.com/33cn/chain33/common/log/log15"
"gopkg.in/yaml.v2"
"os" "os"
"path/filepath" "path/filepath"
log "github.com/33cn/chain33/common/log/log15"
"gopkg.in/yaml.v2"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
_ "github.com/33cn/plugin/plugin/crypto/init" _ "github.com/33cn/plugin/plugin/crypto/init"
"github.com/33cn/plugin/plugin/dapp/cert/authority/tools/cryptogen/generator" "github.com/33cn/plugin/plugin/dapp/cert/authority/tools/cryptogen/generator"
......
...@@ -123,7 +123,7 @@ func (ks *fileBasedKeyStore) StoreKey(k Key) (err error) { ...@@ -123,7 +123,7 @@ func (ks *fileBasedKeyStore) StoreKey(k Key) (err error) {
func (ks *fileBasedKeyStore) storePrivateKeyByte(alias string, privateKey interface{}) error { func (ks *fileBasedKeyStore) storePrivateKeyByte(alias string, privateKey interface{}) error {
rawKey, err := utils.PrivateKeyToByte(privateKey) rawKey, err := utils.PrivateKeyToByte(privateKey)
if err != nil { if err != nil {
logger.Error("Failed converting private key to PEM","name", alias, "error", err) logger.Error("Failed converting private key to PEM", "name", alias, "error", err)
return err return err
} }
......
...@@ -12,6 +12,7 @@ import ( ...@@ -12,6 +12,7 @@ import (
"encoding/asn1" "encoding/asn1"
"encoding/pem" "encoding/pem"
"fmt" "fmt"
pkecdsa "github.com/33cn/plugin/plugin/crypto/ecdsa" pkecdsa "github.com/33cn/plugin/plugin/crypto/ecdsa"
pkesm2 "github.com/33cn/plugin/plugin/crypto/sm2" pkesm2 "github.com/33cn/plugin/plugin/crypto/sm2"
"github.com/33cn/plugin/plugin/dapp/evm/executor/vm/common" "github.com/33cn/plugin/plugin/dapp/evm/executor/vm/common"
......
...@@ -424,7 +424,7 @@ func createFolderStructure(rootDir string, isOrg bool) error { ...@@ -424,7 +424,7 @@ func createFolderStructure(rootDir string, isOrg bool) error {
filepath.Join(rootDir, "signcerts"), filepath.Join(rootDir, "signcerts"),
} }
if isOrg { if isOrg {
folders = append(folders, filepath.Join(rootDir, "intermediatecerts"),) folders = append(folders, filepath.Join(rootDir, "intermediatecerts"))
} }
for _, folder := range folders { for _, folder := range folders {
......
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