Skip to content

Commit

Permalink
Merge branch 'develop' into feature/BCF-2731-EVM-GRPC-provider
Browse files Browse the repository at this point in the history
# Conflicts:
#	core/scripts/go.mod
#	core/scripts/go.sum
#	go.mod
#	go.sum
#	integration-tests/go.mod
#	integration-tests/go.sum
  • Loading branch information
george-dorin committed Nov 10, 2023
2 parents d6af5bb + 75d0743 commit 3649c4c
Show file tree
Hide file tree
Showing 187 changed files with 5,025 additions and 553 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ MacOSX*

contracts/yarn.lock


# Ignore DevSpace cache and log folder
.devspace/
go.work*
go.work*

# This sometimes shows up for some reason
tools/flakeytests/coverage.txt
4 changes: 4 additions & 0 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ chainlink-local-start:
install-median: ## Build & install the chainlink-median binary.
go install $(GOFLAGS) ./plugins/cmd/chainlink-median

.PHONY: install-medianpoc
install-medianpoc: ## Build & install the chainlink-medianpoc binary.
go install $(GOFLAGS) ./plugins/cmd/chainlink-medianpoc

.PHONY: docker ## Build the chainlink docker image
docker:
docker buildx build \
Expand Down
18 changes: 18 additions & 0 deletions common/client/mock_hashable_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package client

import "cmp"

// Hashable - simple implementation of types.Hashable interface to be used as concrete type in tests
type Hashable string

func (h Hashable) Cmp(c Hashable) int {
return cmp.Compare(h, c)
}

func (h Hashable) String() string {
return string(h)
}

func (h Hashable) Bytes() []byte {
return []byte(h)
}
57 changes: 57 additions & 0 deletions common/client/mock_head_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

168 changes: 168 additions & 0 deletions common/client/mock_node_client_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 57 additions & 0 deletions common/client/mock_node_selector_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3649c4c

Please sign in to comment.