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

Commit 569a972

Browse files
authored
Merge pull request #2026 from OpenBazaar/ethereum-master
Implement Ethereum
2 parents 2c8da24 + e418906 commit 569a972

File tree

632 files changed

+71285
-17974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

632 files changed

+71285
-17974
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Test artifacts
22

33
repo/testdata/
4+
./config*
45

56
# Compiled Object files, Static and Dynamic libs (Shared Objects)
67
*.o
@@ -39,6 +40,7 @@ dist
3940
.tags*
4041
*.sw?
4142
openbazaar-go*
43+
config_*
4244

4345
# macOS
4446
.DS_Store

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ linters:
4848
- goconst
4949
- govet
5050
- megacheck
51+
- errcheck
5152
disable:
5253
- goimports
53-
- errcheck
5454
- golint
5555
- prealloc

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ before_install:
1212
install:
1313
- echo "No external dependencies required. Skipping travis default library dependency setup to use vendors..."
1414
script:
15-
- $GOPATH/bin/golangci-lint run --deadline 10m
15+
- $GOPATH/bin/golangci-lint run --deadline 10m --new-from-rev=24dc0f64
1616
- cd $TRAVIS_BUILD_DIR && go test -i && ./test_compile.sh
1717
- goveralls -coverprofile=coverage.out -service travis-ci -repotoken $COVERALLS_TOKEN
1818
after_success:

Godeps/Godeps.json

Lines changed: 38 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ qa_test: openbazaard ## Run QA test suite against current working copy
5757
$(info "Running QA... (openbazaard: ../$(OPENBAZAARD_NAME) bitcoind: $(BITCOIND_PATH)/bin/bitcoind)")
5858
(cd qa && ./runtests.sh ../$(OPENBAZAARD_NAME) $(BITCOIND_PATH)/bin/bitcoind)
5959

60+
.PHONY: qa_eth_test
61+
qa_eth_test: openbazaard ## Run ETH-based QA test suite against current working copy
62+
$(info "Running ETH QA... (openbazaard: ../$(OPENBAZAARD_NAME))")
63+
(cd qa && ./runtests_eth.sh ../$(OPENBAZAARD_NAME))
64+
6065
##
6166
## Docker
6267
##

api/endpoints.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ func get(i *jsonAPIHandler, path string, w http.ResponseWriter, r *http.Request)
129129
i.GETPeers(w, r)
130130
case strings.HasPrefix(path, "/ob/config"):
131131
i.GETConfig(w, r)
132+
case strings.HasPrefix(path, "/wallet/currencies"):
133+
i.GETWalletCurrencyDictionary(w, r)
132134
case strings.HasPrefix(path, "/wallet/address"):
133135
i.GETAddress(w, r)
134136
case strings.HasPrefix(path, "/wallet/mnemonic"):

0 commit comments

Comments
 (0)