Skip to content
This repository has been archived by the owner on Mar 28, 2023. It is now read-only.

Commit

Permalink
Merge pull request #2026 from OpenBazaar/ethereum-master
Browse files Browse the repository at this point in the history
Implement Ethereum
  • Loading branch information
cpacia authored Mar 9, 2020
2 parents 2c8da24 + e418906 commit 569a972
Show file tree
Hide file tree
Showing 632 changed files with 71,285 additions and 17,974 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Test artifacts

repo/testdata/
./config*

# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
Expand Down Expand Up @@ -39,6 +40,7 @@ dist
.tags*
*.sw?
openbazaar-go*
config_*

# macOS
.DS_Store
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ linters:
- goconst
- govet
- megacheck
- errcheck
disable:
- goimports
- errcheck
- golint
- prealloc
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ before_install:
install:
- echo "No external dependencies required. Skipping travis default library dependency setup to use vendors..."
script:
- $GOPATH/bin/golangci-lint run --deadline 10m
- $GOPATH/bin/golangci-lint run --deadline 10m --new-from-rev=24dc0f64
- cd $TRAVIS_BUILD_DIR && go test -i && ./test_compile.sh
- goveralls -coverprofile=coverage.out -service travis-ci -repotoken $COVERALLS_TOKEN
after_success:
Expand Down
74 changes: 38 additions & 36 deletions Godeps/Godeps.json

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

5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ qa_test: openbazaard ## Run QA test suite against current working copy
$(info "Running QA... (openbazaard: ../$(OPENBAZAARD_NAME) bitcoind: $(BITCOIND_PATH)/bin/bitcoind)")
(cd qa && ./runtests.sh ../$(OPENBAZAARD_NAME) $(BITCOIND_PATH)/bin/bitcoind)

.PHONY: qa_eth_test
qa_eth_test: openbazaard ## Run ETH-based QA test suite against current working copy
$(info "Running ETH QA... (openbazaard: ../$(OPENBAZAARD_NAME))")
(cd qa && ./runtests_eth.sh ../$(OPENBAZAARD_NAME))

##
## Docker
##
Expand Down
2 changes: 2 additions & 0 deletions api/endpoints.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ func get(i *jsonAPIHandler, path string, w http.ResponseWriter, r *http.Request)
i.GETPeers(w, r)
case strings.HasPrefix(path, "/ob/config"):
i.GETConfig(w, r)
case strings.HasPrefix(path, "/wallet/currencies"):
i.GETWalletCurrencyDictionary(w, r)
case strings.HasPrefix(path, "/wallet/address"):
i.GETAddress(w, r)
case strings.HasPrefix(path, "/wallet/mnemonic"):
Expand Down
Loading

0 comments on commit 569a972

Please sign in to comment.