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.

Sign up for GitHub

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

Jump to bottom

chore: BLS signer refactor #110

Merged
merged 9 commits into from
Sep 2, 2022
Merged

chore: BLS signer refactor #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f927baa
add bls signer
gitferry Aug 26, 2022
9cfba3b
added mocks
gitferry Aug 29, 2022
f719b4f
finished unit test of sendBlsSig
gitferry Aug 29, 2022
146e957
rm unnecessary json
gitferry Aug 29, 2022
3ba03c8
inject client context into newApp
gitferry Aug 30, 2022
1c23555
Merge branch 'main' of github.com:babylonchain/babylon into checkpoin…
gitferry Aug 31, 2022
d842b71
add some TODOs
gitferry Aug 31, 2022
56936c1
minor
gitferry Sep 1, 2022
dc9266b
Merge branch 'main' of github.com:babylonchain/babylon into checkpoin…
gitferry Sep 1, 2022
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
14 changes: 1 addition & 13 deletions app/test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import (
"fmt"
"github.com/cosmos/cosmos-sdk/crypto/keyring"
tmconfig "github.com/tendermint/tendermint/config"
tmos "github.com/tendermint/tendermint/libs/os"
"path/filepath"
"strconv"
"testing"
"time"
Expand Down Expand Up @@ -96,18 +94,8 @@ func Setup(isCheckTx bool) *BabylonApp {
// SetupPrivSigner sets up a PrivSigner for testing
func SetupPrivSigner() (*PrivSigner, error) {
nodeCfg := tmconfig.DefaultConfig()
pvKeyFile := nodeCfg.PrivValidatorKeyFile()
err := tmos.EnsureDir(filepath.Dir(pvKeyFile), 0777)
if err != nil {
return nil, err
}
pvStateFile := nodeCfg.PrivValidatorStateFile()
err = tmos.EnsureDir(filepath.Dir(pvStateFile), 0777)
if err != nil {
return nil, err
}
privSigner, _ := InitClientContext(client.Context{}, keyring.BackendMemory)
privSigner.WrappedPV.Clean(pvKeyFile, pvStateFile)
privSigner.WrappedPV.Clean(nodeCfg.PrivValidatorKeyFile(), nodeCfg.PrivValidatorStateFile())
return privSigner, nil
}

Expand Down
6 changes: 6 additions & 0 deletions app/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type PrivSigner struct {
}

func InitClientContext(clientCtx client.Context, backend string) (*PrivSigner, error) {
// setup private validator
nodeCfg := tmconfig.DefaultConfig()
pvKeyFile := nodeCfg.PrivValidatorKeyFile()
err := tmos.EnsureDir(filepath.Dir(pvKeyFile), 0777)
Expand All @@ -27,7 +28,12 @@ func InitClientContext(clientCtx client.Context, backend string) (*PrivSigner, e
}
pvStateFile := nodeCfg.PrivValidatorStateFile()
err = tmos.EnsureDir(filepath.Dir(pvStateFile), 0777)
if err != nil {
return nil, err
}
wrappedPV := privval.LoadOrGenWrappedFilePV(pvKeyFile, pvStateFile)

// setup client context
encodingCfg := MakeTestEncodingConfig()
clientCtx = client.Context{}.
WithHomeDir(DefaultNodeHome).
Expand Down