Skip to content

Commit

Permalink
Merge branch 'master' into evan/put-ipfs-api-object-compute-twice
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-forbes committed Mar 15, 2021
2 parents 3bf7bca + 0b9a56f commit 8cbaa42
Show file tree
Hide file tree
Showing 204 changed files with 231 additions and 31,403 deletions.
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
# global owners are only requested if there isn't a more specific
# codeowner specified below. For this reason, the global codeowners
# are often repeated in package-level definitions.
* @marbar3778 @liamsi @musalbas
* @marbar3778 @liamsi @evan-forbes

# Overrides for tooling packages
.circleci/ @marbar3778 @liamsi
.github/ @marbar3778 @liamsi
DOCKER/ @marbar3778 @liamsi
docs/ @marbar3778 @liamsi @adlerjohn @musalbas
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
- run: |
cat ./*profile.out | grep -v "mode: atomic" >> coverage.txt
if: env.GIT_DIFF
- uses: codecov/codecov-action@v1.0.15
- uses: codecov/codecov-action@v1.2.2
with:
file: ./coverage.txt
if: env.GIT_DIFF
2 changes: 1 addition & 1 deletion .github/workflows/e2e-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Notify Slack on failure
uses: rtCamp/action-slack-notify@ae4223259071871559b6e9d08b24a63d71b3f0c0
uses: rtCamp/action-slack-notify@f565a63638bd3615e76249bffab00fcb9dab90f7
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
SLACK_CHANNEL: ci-notfications
Expand Down
146 changes: 0 additions & 146 deletions .github/workflows/tests.yml

This file was deleted.

12 changes: 0 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,6 @@ proto-check-breaking-ci:
@$(DOCKER_BUF) check breaking --against-input $(HTTPS_GIT)#branch=master
.PHONY: proto-check-breaking-ci

###############################################################################
### Build ABCI ###
###############################################################################

build_abci:
@go build -mod=readonly -i ./abci/cmd/...
.PHONY: build_abci

install_abci:
@go install -mod=readonly ./abci/cmd/...
.PHONY: install_abci

###############################################################################
### Distribution ###
###############################################################################
Expand Down
25 changes: 1 addition & 24 deletions abci/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,14 @@ package abcicli

import (
"context"
"fmt"

"sync"

"github.com/lazyledger/lazyledger-core/abci/types"
"github.com/lazyledger/lazyledger-core/libs/service"
tmsync "github.com/lazyledger/lazyledger-core/libs/sync"
)

const (
dialRetryIntervalSeconds = 3
echoRetryIntervalSeconds = 1
)

//go:generate mockery --case underscore --name Client

// Client defines an interface for an ABCI client.
Expand Down Expand Up @@ -66,24 +61,6 @@ type Client interface {
PreprocessTxsSync(context.Context, types.RequestPreprocessTxs) (*types.ResponsePreprocessTxs, error)
}

//----------------------------------------

// NewClient returns a new ABCI client of the specified transport type.
// It returns an error if the transport is not "socket" or "grpc"
func NewClient(addr, transport string, mustConnect bool) (client Client, err error) {
switch transport {
case "socket":
client = NewSocketClient(addr, mustConnect)
case "grpc":
client = NewGRPCClient(addr, mustConnect)
default:
err = fmt.Errorf("unknown abci transport %s", transport)
}
return
}

//----------------------------------------

type Callback func(*types.Request, *types.Response)

//----------------------------------------
Expand Down
Loading

0 comments on commit 8cbaa42

Please sign in to comment.