Skip to content

Commit

Permalink
Rename repository.
Browse files Browse the repository at this point in the history
  • Loading branch information
anchaj committed Mar 29, 2020
1 parent 3ca4b2f commit dcd7456
Show file tree
Hide file tree
Showing 168 changed files with 380 additions and 380 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ You must run `gofmt` before each commit. Travis will fail if you do not run it.

All commits are checked with [golangci-lint](https://github.com/golangci/golangci-lint) using the [.golangci.yml](.golangci.yml) config in the repo.

Additionally, we like to keep the [Go Report Card](https://goreportcard.com/report/github.com/phoreproject/openbazaar-go) score at A or better. So keep those other tests in mind when you commit.
Additionally, we like to keep the [Go Report Card](https://goreportcard.com/report/github.com/phoreproject/pm-go) score at A or better. So keep those other tests in mind when you commit.

## Tests
If you add new code, please submit a unit test with it. We might not accept the PR without it. Additionally, you are expected to make the appropriate changes to existing tests if they are affected by your commits. This also includes the integration tests in the [qa package](https://github.com/phoreproject/openbazaar-go/tree/master/qa).
If you add new code, please submit a unit test with it. We might not accept the PR without it. Additionally, you are expected to make the appropriate changes to existing tests if they are affected by your commits. This also includes the integration tests in the [qa package](https://github.com/phoreproject/pm-go/tree/master/qa).

## Pull Requests
If your PR isn't ready to merge make sure you specify this somehow. For example by placing [WIP] in the PR title. Ideally you should include a `task list` in the PR message to track the progress of the PR.
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN wget https://github.com/google/protobuf/releases/download/v3.6.0/protoc-3.6.
mv ./bin/protoc /usr/local/bin/ && \
rm -rf ./include ./bin

WORKDIR /go/src/github.com/phoreproject/openbazaar-go
WORKDIR /go/src/github.com/phoreproject/pm-go
RUN go get -u github.com/gogo/protobuf/proto \
github.com/golang/protobuf/protoc-gen-go \
github.com/icrowley/fake \
Expand All @@ -33,7 +33,7 @@ RUN go get -u github.com/gogo/protobuf/proto \

RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0

WORKDIR /go/src/github.com/phoreproject/openbazaar-go
WORKDIR /go/src/github.com/phoreproject/pm-go

COPY . .

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dummy
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build stage
FROM golang:1.8.1
WORKDIR /go/src/github.com/phoreproject/openbazaar-go
WORKDIR /go/src/github.com/phoreproject/pm-go
COPY . .
RUN go build -o /opt/dummy ./dummy

Expand Down
2 changes: 1 addition & 1 deletion Godeps/Godeps.json

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

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
##

ios_framework:
gomobile bind -target=ios github.com/phoreproject/openbazaar-go/mobile
gomobile bind -target=ios github.com/phoreproject/pm-go/mobile

android_framework:
gomobile bind -target=android github.com/phoreproject/openbazaar-go/mobile
gomobile bind -target=android github.com/phoreproject/pm-go/mobile

##
## Protobuf compilation
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ OpenBazaar Server Daemon in Go

[![Build Status](https://travis-ci.org/OpenBazaar/openbazaar-go.svg?branch=master)](https://travis-ci.org/OpenBazaar/openbazaar-go)
[![Coverage Status](https://coveralls.io/repos/github/OpenBazaar/openbazaar-go/badge.svg?branch=master)](https://coveralls.io/github/OpenBazaar/openbazaar-go?branch=master)
[![Go Report Card](https://goreportcard.com/badge/github.com/phoreproject/openbazaar-go)](https://goreportcard.com/report/github.com/phoreproject/openbazaar-go)
[![Go Report Card](https://goreportcard.com/badge/github.com/phoreproject/pm-go)](https://goreportcard.com/report/github.com/phoreproject/pm-go)

This repository contains the Phore Marketplace server daemon which handles the heavy lifting for the [Phore Marketplace](https://phore.io/) desktop application. The server combines several technologies: A modified [IPFS](https://ipfs.io) node, which itself combines ideas from Git, BitTorrent, and Kademlia. A lightweight SPV Bitcoin wallet for interacting with the Bitcoin network. And a JSON API which can be used by a user interface to control the node and browse the network. If you are looking for the OpenBazaar user interface code see [here](https://github.com/phoreproject/openbazaar-desktop).

Expand All @@ -28,11 +28,11 @@ A typical install of OpenBazaar contains a bundle of the server daemon and user

### Install Pre-built Packages

The easiest way to run the server is to download a pre-built binary. You can find binaries of our latest release for each operating system [here](https://github.com/phoreproject/openbazaar-go/releases/).
The easiest way to run the server is to download a pre-built binary. You can find binaries of our latest release for each operating system [here](https://github.com/phoreproject/pm-go/releases/).

### Build from Source

To build from source you will need to have Go installed and properly configured. Detailed instructions for installing Go and openbazaar-go on each operating system can be found in the [docs package](https://github.com/phoreproject/openbazaar-go/tree/master/docs).
To build from source you will need to have Go installed and properly configured. Detailed instructions for installing Go and openbazaar-go on each operating system can be found in the [docs package](https://github.com/phoreproject/pm-go/tree/master/docs).

## Dependency Management

Expand All @@ -44,7 +44,7 @@ We are using a [fork](https://github.com/phoreproject/go-ipfs) of go-ipfs in the

## Updating

You can either pull in remote changes as normal or run `go get -u github.com/phoreproject/openbazaar-go`.
You can either pull in remote changes as normal or run `go get -u github.com/phoreproject/pm-go`.

## Usage

Expand Down Expand Up @@ -101,7 +101,7 @@ Documentation of the OpenBazaar protocol has not been formalized yet. If you wou

## Contributing

Contributions are definitely welcome! Please read the Contributing [Guidelines](https://github.com/phoreproject/openbazaar-go/blob/master/CONTRIBUTING.md) before starting.
Contributions are definitely welcome! Please read the Contributing [Guidelines](https://github.com/phoreproject/pm-go/blob/master/CONTRIBUTING.md) before starting.

## License
[MIT](https://github.com/phoreproject/openbazaar-go/blob/master/LICENSE).
[MIT](https://github.com/phoreproject/pm-go/blob/master/LICENSE).
4 changes: 2 additions & 2 deletions api/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/ipfs/go-ipfs/core/corehttp"
"github.com/op/go-logging"
"github.com/phoreproject/openbazaar-go/core"
"github.com/phoreproject/openbazaar-go/schema"
"github.com/phoreproject/pm-go/core"
"github.com/phoreproject/pm-go/schema"
)

var log = logging.MustGetLogger("api")
Expand Down
10 changes: 5 additions & 5 deletions api/jsonapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ import (
"github.com/ipfs/go-ipfs/core/coreapi"
"github.com/ipfs/go-ipfs/namesys"
"github.com/ipfs/go-ipfs/repo/fsrepo"
"github.com/phoreproject/openbazaar-go/core"
"github.com/phoreproject/openbazaar-go/ipfs"
"github.com/phoreproject/openbazaar-go/pb"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/schema"
"github.com/phoreproject/pm-go/core"
"github.com/phoreproject/pm-go/ipfs"
"github.com/phoreproject/pm-go/pb"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/schema"
)

type JSONAPIConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion api/jsonapi_data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package api
import (
"fmt"

"github.com/phoreproject/openbazaar-go/pb"
"github.com/phoreproject/pm-go/pb"
)

const notFoundJSON = `{"success": false,"reason": "Not Found"}`
Expand Down
2 changes: 1 addition & 1 deletion api/jsonapi_helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/OpenBazaar/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/op/go-logging"
"github.com/phoreproject/openbazaar-go/test"
"github.com/phoreproject/pm-go/test"
)

// testURIRoot is the root http URI to hit for testing
Expand Down
10 changes: 5 additions & 5 deletions api/jsonapi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"testing"
"time"

"github.com/phoreproject/openbazaar-go/core"
"github.com/phoreproject/openbazaar-go/pb"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/test"
"github.com/phoreproject/openbazaar-go/test/factory"
"github.com/phoreproject/pm-go/core"
"github.com/phoreproject/pm-go/pb"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/test"
"github.com/phoreproject/pm-go/test/factory"
)

func TestMain(m *testing.M) {
Expand Down
4 changes: 2 additions & 2 deletions api/notifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/smtp"
"strings"

"github.com/phoreproject/openbazaar-go/core"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/pm-go/core"
"github.com/phoreproject/pm-go/repo"
)

// Notification manager intercepts data form 'inChan' which is embedded
Expand Down
2 changes: 1 addition & 1 deletion api/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"
"strings"

"github.com/phoreproject/openbazaar-go/pb"
"github.com/phoreproject/pm-go/pb"
)

type TransactionQuery struct {
Expand Down
4 changes: 2 additions & 2 deletions api/ws.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/gorilla/websocket"
"github.com/op/go-logging"
"github.com/phoreproject/openbazaar-go/core"
"github.com/phoreproject/openbazaar-go/schema"
"github.com/phoreproject/pm-go/core"
"github.com/phoreproject/pm-go/schema"
)

type connection struct {
Expand Down
10 changes: 5 additions & 5 deletions cmd/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
ipfscore "github.com/ipfs/go-ipfs/core"
"github.com/ipfs/go-ipfs/repo/fsrepo"
"github.com/phoreproject/multiwallet/util"
"github.com/phoreproject/openbazaar-go/core"
"github.com/phoreproject/openbazaar-go/ipfs"
"github.com/phoreproject/openbazaar-go/pb"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/repo/db"
"github.com/phoreproject/pm-go/core"
"github.com/phoreproject/pm-go/ipfs"
"github.com/phoreproject/pm-go/pb"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/repo/db"
"golang.org/x/crypto/ssh/terminal"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/decrypt.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/OpenBazaar/wallet-interface"
"github.com/ipfs/go-ipfs/repo/fsrepo"
"github.com/phoreproject/multiwallet/util"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/repo/db"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/repo/db"
"golang.org/x/crypto/ssh/terminal"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/encrypt.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/OpenBazaar/wallet-interface"
"github.com/ipfs/go-ipfs/repo/fsrepo"
"github.com/phoreproject/multiwallet/util"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/repo/db"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/repo/db"
"golang.org/x/crypto/ssh/terminal"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/gencerts.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"
"time"

"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/pm-go/repo"
)

type GenerateCertificates struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/phoreproject/multiwallet/util"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/pm-go/repo"

"github.com/op/go-logging"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ import (

"github.com/OpenBazaar/wallet-interface"
"github.com/phoreproject/multiwallet/util"
"github.com/phoreproject/openbazaar-go/ipfs"
obnet "github.com/phoreproject/openbazaar-go/net"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/repo/db"
"github.com/phoreproject/openbazaar-go/schema"
"github.com/phoreproject/pm-go/ipfs"
obnet "github.com/phoreproject/pm-go/net"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/repo/db"
"github.com/phoreproject/pm-go/schema"

"github.com/ipfs/go-ipfs/core"
ipfscore "github.com/ipfs/go-ipfs/core"
Expand Down
4 changes: 2 additions & 2 deletions cmd/setapicreds.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"syscall"

"github.com/ipfs/go-ipfs/repo/fsrepo"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/schema"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/schema"
"golang.org/x/crypto/ssh/terminal"
)

Expand Down
30 changes: 15 additions & 15 deletions cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ import (
"github.com/natefinch/lumberjack"
"github.com/op/go-logging"
"github.com/phoreproject/multiwallet/util"
"github.com/phoreproject/openbazaar-go/api"
"github.com/phoreproject/openbazaar-go/core"
"github.com/phoreproject/openbazaar-go/ipfs"
obnet "github.com/phoreproject/openbazaar-go/net"
"github.com/phoreproject/openbazaar-go/net/service"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/repo/db"
"github.com/phoreproject/openbazaar-go/repo/migrations"
"github.com/phoreproject/openbazaar-go/schema"
sto "github.com/phoreproject/openbazaar-go/storage"
"github.com/phoreproject/openbazaar-go/storage/dropbox"
"github.com/phoreproject/openbazaar-go/storage/selfhosted"
"github.com/phoreproject/openbazaar-go/wallet"
lis "github.com/phoreproject/openbazaar-go/wallet/listeners"
"github.com/phoreproject/openbazaar-go/wallet/resync"
"github.com/phoreproject/pm-go/api"
"github.com/phoreproject/pm-go/core"
"github.com/phoreproject/pm-go/ipfs"
obnet "github.com/phoreproject/pm-go/net"
"github.com/phoreproject/pm-go/net/service"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/repo/db"
"github.com/phoreproject/pm-go/repo/migrations"
"github.com/phoreproject/pm-go/schema"
sto "github.com/phoreproject/pm-go/storage"
"github.com/phoreproject/pm-go/storage/dropbox"
"github.com/phoreproject/pm-go/storage/selfhosted"
"github.com/phoreproject/pm-go/wallet"
lis "github.com/phoreproject/pm-go/wallet/listeners"
"github.com/phoreproject/pm-go/wallet/resync"
"github.com/tyler-smith/go-bip39"

"golang.org/x/crypto/ssh/terminal"
Expand Down
6 changes: 3 additions & 3 deletions cmd/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/ipfs/go-ipfs/repo/fsrepo"
"github.com/phoreproject/multiwallet/util"
obnet "github.com/phoreproject/openbazaar-go/net"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/repo/db"
obnet "github.com/phoreproject/pm-go/net"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/repo/db"
)

type Status struct {
Expand Down
6 changes: 3 additions & 3 deletions core/completion.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/phoreproject/openbazaar-go/ipfs"
"github.com/phoreproject/openbazaar-go/pb"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/pm-go/ipfs"
"github.com/phoreproject/pm-go/pb"
"github.com/phoreproject/pm-go/repo"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions core/completion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/OpenBazaar/wallet-interface"
"github.com/golang/protobuf/ptypes"
"github.com/phoreproject/openbazaar-go/core"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/test/factory"
"github.com/phoreproject/pm-go/core"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/test/factory"
)

func TestReleaseFundsAfterTimeoutErrors(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion core/confirmation.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/OpenBazaar/wallet-interface"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/phoreproject/openbazaar-go/pb"
"github.com/phoreproject/pm-go/pb"
)

// NewOrderConfirmation - add order confirmation to the contract
Expand Down
12 changes: 6 additions & 6 deletions core/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (

"github.com/phoreproject/multiwallet"

"github.com/phoreproject/openbazaar-go/ipfs"
"github.com/phoreproject/openbazaar-go/net"
rep "github.com/phoreproject/openbazaar-go/net/repointer"
ret "github.com/phoreproject/openbazaar-go/net/retriever"
"github.com/phoreproject/openbazaar-go/repo"
sto "github.com/phoreproject/openbazaar-go/storage"
"github.com/phoreproject/pm-go/ipfs"
"github.com/phoreproject/pm-go/net"
rep "github.com/phoreproject/pm-go/net/repointer"
ret "github.com/phoreproject/pm-go/net/retriever"
"github.com/phoreproject/pm-go/repo"
sto "github.com/phoreproject/pm-go/storage"

"github.com/btcsuite/btcutil/hdkeychain"
"github.com/gosimple/slug"
Expand Down
8 changes: 4 additions & 4 deletions core/disputes.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
hd "github.com/btcsuite/btcutil/hdkeychain"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/phoreproject/openbazaar-go/net"
"github.com/phoreproject/openbazaar-go/pb"
"github.com/phoreproject/openbazaar-go/repo"
"github.com/phoreproject/openbazaar-go/repo/db"
"github.com/phoreproject/pm-go/net"
"github.com/phoreproject/pm-go/pb"
"github.com/phoreproject/pm-go/repo"
"github.com/phoreproject/pm-go/repo/db"
"golang.org/x/net/context"
)

Expand Down
Loading

0 comments on commit dcd7456

Please sign in to comment.