Skip to content

Commit

Permalink
bugfix: wrong binary name (#338)
Browse files Browse the repository at this point in the history
* bugfix wrong binary name

* (refactor) rename to `oc`
  • Loading branch information
tnasu authored Oct 18, 2021
1 parent 046b4b0 commit ff4ad82
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"

build-abci:
name: Build
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- uses: actions/[email protected]
with:
path: ~/go/bin
key: ${{ runner.os }}-${{ github.sha }}-tm-binary
key: ${{ runner.os }}-${{ github.sha }}-oc-binary
if: env.GIT_DIFF

test_abci_apps:
Expand Down
2 changes: 1 addition & 1 deletion crypto/sr25519/privkey.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (privKey PrivKey) Type() string {

// GenPrivKey generates a new sr25519 private key.
// It uses OS randomness in conjunction with the current global random seed
// in tendermint/libs/common to generate the private key.
// in libs/common to generate the private key.
func GenPrivKey() PrivKey {
return genPrivKey(crypto.CReader())
}
Expand Down
4 changes: 2 additions & 2 deletions libs/log/oc_logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ func TestError(t *testing.T) {
}
}

func BenchmarkTMLoggerSimple(b *testing.B) {
func BenchmarkOCLoggerSimple(b *testing.B) {
benchmarkRunner(b, log.NewOCLogger(ioutil.Discard), baseInfoMessage)
}

func BenchmarkTMLoggerContextual(b *testing.B) {
func BenchmarkOCLoggerContextual(b *testing.B) {
benchmarkRunner(b, log.NewOCLogger(ioutil.Discard), withInfoMessage)
}

Expand Down
8 changes: 4 additions & 4 deletions libs/log/ocfmt_logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/line/ostracon/libs/log"
)

func TestTMFmtLogger(t *testing.T) {
func TestOCFmtLogger(t *testing.T) {
t.Parallel()
buf := &bytes.Buffer{}
logger := log.NewOCFmtLogger(buf)
Expand Down Expand Up @@ -61,15 +61,15 @@ func TestTMFmtLogger(t *testing.T) {
assert.Regexp(t, regexp.MustCompile(`N\[.+\] unknown \s+ hash=74657374206D65\n$`), buf.String())
}

func BenchmarkTMFmtLoggerSimple(b *testing.B) {
func BenchmarkOCFmtLoggerSimple(b *testing.B) {
benchmarkRunnerKitlog(b, log.NewOCFmtLogger(ioutil.Discard), baseMessage)
}

func BenchmarkTMFmtLoggerContextual(b *testing.B) {
func BenchmarkOCFmtLoggerContextual(b *testing.B) {
benchmarkRunnerKitlog(b, log.NewOCFmtLogger(ioutil.Discard), withMessage)
}

func TestTMFmtLoggerConcurrency(t *testing.T) {
func TestOCFmtLoggerConcurrency(t *testing.T) {
t.Parallel()
testConcurrency(t, log.NewOCFmtLogger(ioutil.Discard), 10000)
}
Expand Down
4 changes: 2 additions & 2 deletions libs/log/testing_logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var (
_testingLogger Logger
)

// TestingLogger returns a TMLogger which writes to STDOUT if testing being run
// TestingLogger returns a OCLogger which writes to STDOUT if testing being run
// with the verbose (-v) flag, NopLogger otherwise.
//
// Note that the call to TestingLogger() must be made
Expand All @@ -23,7 +23,7 @@ func TestingLogger() Logger {
return TestingLoggerWithOutput(os.Stdout)
}

// TestingLoggerWOutput returns a TMLogger which writes to (w io.Writer) if testing being run
// TestingLoggerWOutput returns a OCLogger which writes to (w io.Writer) if testing being run
// with the verbose (-v) flag, NopLogger otherwise.
//
// Note that the call to TestingLoggerWithOutput(w io.Writer) must be made
Expand Down
2 changes: 1 addition & 1 deletion statesync/chunks.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type chunkQueue struct {
// newChunkQueue creates a new chunk queue for a snapshot, using a temp dir for storage.
// Callers must call Close() when done.
func newChunkQueue(snapshot *snapshot, tempDir string) (*chunkQueue, error) {
dir, err := ioutil.TempDir(tempDir, "tm-statesync")
dir, err := ioutil.TempDir(tempDir, "oc-statesync")
if err != nil {
return nil, fmt.Errorf("unable to create temp dir for state sync chunks: %w", err)
}
Expand Down

0 comments on commit ff4ad82

Please sign in to comment.