Skip to content

Commit

Permalink
Merge remote-tracking branch 'pokt/main' into chore/libp2p-1
Browse files Browse the repository at this point in the history
* pokt/main:
  [Tooling] Returning failed tests full output (#542)
  [Tooling] Update CLI to support key management (Issue #489) (#524)
  • Loading branch information
bryanchriswhite committed Feb 24, 2023
2 parents 01e970f + 6ef866b commit 8768593
Show file tree
Hide file tree
Showing 60 changed files with 1,409 additions and 281 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Output test failures
# Makes it easier to find failed tests so no need to scroll through the whole log.
if: ${{ failure() && env.TARGET_GOLANG_VERSION == matrix.go }}
run: jq --argjson fail_tests "$(jq -c -r 'select(.Action == "fail") | select(.Test) | .Test' test_results.json | jq -R -s -c 'split("\n") | map(select(length>0))')" 'select(.Test as $t | ($fail_tests | arrays)[] | select($t == .))' test_results.json
run: jq --argjson fail_tests "$(jq -c -r 'select(.Action == "fail") | select(.Test) | .Test' test_results.json | jq -R -s -c -r 'split("\n") | map(select(length>0))')" 'select(.Test as $t | ($fail_tests | arrays)[] | select($t == .)) | select(.Output) | .Output' test_results.json | jq -r | sed ':a;N;$!ba;s/\n\n/\n/g'
- name: Upload test results
if: ${{ always() && env.TARGET_GOLANG_VERSION == matrix.go }}
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion app/client/cli/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func accountCommands() []*cobra.Command {
toAddr := crypto.AddressFromString(args[1])
amount := args[2]

// Open the debug keybase at the specified path
// Open the keybase at the specified path
pocketDir := strings.TrimSuffix(dataDir, "/")
keybasePath, err := filepath.Abs(pocketDir + keybaseSuffix)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions app/client/cli/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cli

import (
"context"
"log"
"github.com/pokt-network/pocket/logger"
"os"

// NOTE: Imported for debug purposes in order to populate the keybase with the pre-generated keys
Expand All @@ -25,7 +25,7 @@ var (
func init() {
homeDir, err := os.UserHomeDir()
if err != nil {
log.Fatalf("[ERROR] Cannot find user home directory: %s", err.Error())
logger.Global.Fatal().Err(err).Msg("Cannot find user home directory")
}
rootCmd.PersistentFlags().StringVar(&remoteCLIURL, "remote_cli_url", defaults.DefaultRemoteCLIURL, "takes a remote endpoint in the form of <protocol>://<host> (uses RPC Port)")
rootCmd.PersistentFlags().BoolVar(&nonInteractive, "non_interactive", false, "if true skips the interactive prompts wherever possible (useful for scripting & automation)")
Expand Down
2 changes: 1 addition & 1 deletion app/client/cli/gov.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func govCommands() []*cobra.Command {
// TODO(deblasis): implement RPC client, route and handler
fmt.Printf("changing parameter %s owned by %s to %s\n", args[1], args[0], args[2])

// Open the debug keybase at the specified path
// Open the keybase at the specified path
pocketDir := strings.TrimSuffix(dataDir, "/")
keybasePath, err := filepath.Abs(pocketDir + keybaseSuffix)
if err != nil {
Expand Down
Loading

0 comments on commit 8768593

Please sign in to comment.