Skip to content

Commit

Permalink
multi: update import path for dcrdata (#368)
Browse files Browse the repository at this point in the history
  • Loading branch information
dajohi authored and chappjc committed Feb 28, 2018
1 parent 3db7d56 commit e151343
Show file tree
Hide file tree
Showing 39 changed files with 99 additions and 99 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Only submit a PR once the intended edits are either done or nearing completion.

## Quick Start

1. Fork the repository on GitHub. Just click the little Fork button at https://github.com/dcrdata/dcrdata
1. Fork the repository on GitHub. Just click the little Fork button at https://github.com/decred/dcrdata
2. Clone your newly forked dcrdata repository

```sh
Expand Down Expand Up @@ -81,7 +81,7 @@ git push -u origin my-great-stuff

7. Create the pull request

At the [main dcrdata repo page](https://github.com/dcrdata/dcrdata) (not your fork) you may find a button suggesting that you might want to create a PR from a branch you just pushed. "Compare & pull request" it will say on a big green button. Click it and it will start form to open a new pull request. Always:
At the [main dcrdata repo page](https://github.com/decred/dcrdata) (not your fork) you may find a button suggesting that you might want to create a PR from a branch you just pushed. "Compare & pull request" it will say on a big green button. Click it and it will start form to open a new pull request. Always:

- Type a detailed comment for the changes you are proposing. Include motivation and a description of the code change.
- Highlight any breaking changes. This includes any syntax changes, added or removed struct fields, interface changes, file renames or deletions, etc.
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# dcrdata

[![Build Status](https://img.shields.io/travis/dcrdata/dcrdata.svg)](https://travis-ci.org/dcrdata/dcrdata)
[![GitHub release](https://img.shields.io/github/release/dcrdata/dcrdata.svg)](https://github.com/dcrdata/dcrdata/releases)
[![Latest tag](https://img.shields.io/github/tag/dcrdata/dcrdata.svg)](https://github.com/dcrdata/dcrdata/tags)
[![Build Status](https://img.shields.io/travis/decred/dcrdata.svg)](https://travis-ci.org/decred/dcrdata)
[![GitHub release](https://img.shields.io/github/release/decred/dcrdata.svg)](https://github.com/decred/dcrdata/releases)
[![Latest tag](https://img.shields.io/github/tag/decred/dcrdata.svg)](https://github.com/decred/dcrdata/tags)
[![ISC License](https://img.shields.io/badge/license-ISC-blue.svg)](http://copyfree.org)

The dcrdata repository is a collection of golang packages and apps for [Decred](https://www.decred.org/) data collection, storage, and presentation.
Expand Down Expand Up @@ -55,11 +55,11 @@ The following instructions assume a Unix-like shell (e.g. bash).

* Clone the dcrdata repository. It **must** be cloned into the following directory.

git clone https://github.com/dcrdata/dcrdata $GOPATH/src/github.com/dcrdata/dcrdata
git clone https://github.com/decred/dcrdata $GOPATH/src/github.com/decred/dcrdata

* Fetch dependencies, and build the `dcrdata` executable.

cd $GOPATH/src/github.com/dcrdata/dcrdata
cd $GOPATH/src/github.com/decred/dcrdata
dep ensure
# build dcrdata executable in workspace:
go build
Expand All @@ -85,7 +85,7 @@ folder as the `dcrdata` executable.

First, update the repository (assuming you have `master` checked out):

cd $GOPATH/src/github.com/dcrdata/dcrdata
cd $GOPATH/src/github.com/decred/dcrdata
git pull origin master
dep ensure
go build
Expand Down Expand Up @@ -374,7 +374,7 @@ of objects implementing the `MempoolDataSaver` interface.

## Plans

See the GitHub issue tracker and the [project milestones](https://github.com/dcrdata/dcrdata/milestones).
See the GitHub issue tracker and the [project milestones](https://github.com/decred/dcrdata/milestones).

## Contributing

Expand All @@ -384,7 +384,7 @@ Yes, please! See the CONTRIBUTING.md file for details, but here's the gist of it
1. Create a branch for your work (`git branch -b cool-stuff`).
1. Code something great.
1. Commit and push to your repo.
1. Create a [pull request](https://github.com/dcrdata/dcrdata/compare).
1. Create a [pull request](https://github.com/decred/dcrdata/compare).

Note that all dcrdata.org community and team members are expected to adhere to
the code of conduct, described in the CODE_OF_CONDUCT file.
Expand Down
2 changes: 1 addition & 1 deletion apirouter.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func newAPIRouter(app *appContext, userRealIP bool) apiMux {
// buf.WriteTo(os.Stdout)

// fmt.Println(docgen.MarkdownRoutesDoc(mux, docgen.MarkdownOpts{
// ProjectPath: "github.com/dcrdata/dcrdata",
// ProjectPath: "github.com/decred/dcrdata",
// Intro: "dcrdata HTTP router directory",
// }))
// return
Expand Down
2 changes: 1 addition & 1 deletion apiroutes.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"strconv"
"sync"

apitypes "github.com/dcrdata/dcrdata/dcrdataapi"
"github.com/decred/dcrd/dcrjson"
"github.com/decred/dcrd/rpcclient"
apitypes "github.com/decred/dcrdata/dcrdataapi"
)

// APIDataSource implements an interface for collecting data for the api
Expand Down
6 changes: 3 additions & 3 deletions blockdata/blockdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import (
"sync"
"time"

apitypes "github.com/dcrdata/dcrdata/dcrdataapi"
"github.com/dcrdata/dcrdata/stakedb"
"github.com/dcrdata/dcrdata/txhelpers"
"github.com/decred/dcrd/chaincfg"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/dcrjson"
"github.com/decred/dcrd/dcrutil"
"github.com/decred/dcrd/rpcclient"
"github.com/decred/dcrd/wire"
apitypes "github.com/decred/dcrdata/dcrdataapi"
"github.com/decred/dcrdata/stakedb"
"github.com/decred/dcrdata/txhelpers"
)

// BlockData contains all the data collected by a Collector and stored
Expand Down
2 changes: 1 addition & 1 deletion blockdata/chainmonitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package blockdata
import (
"sync"

"github.com/dcrdata/dcrdata/txhelpers"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/dcrutil"
"github.com/decred/dcrdata/txhelpers"
)

// ReorgData contains the information from a reoranization notification
Expand Down
4 changes: 2 additions & 2 deletions blockmemdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ package main
import (
"sync"

"github.com/dcrdata/dcrdata/blockdata"
apitypes "github.com/dcrdata/dcrdata/dcrdataapi"
"github.com/decred/dcrd/dcrjson"
"github.com/decred/dcrd/wire"
"github.com/decred/dcrdata/blockdata"
apitypes "github.com/decred/dcrdata/dcrdataapi"
)

// BlockDataToMemdb models the block data and block data basic as maps
Expand Down
6 changes: 3 additions & 3 deletions cmd/rebuilddb/rebuilddb.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"sync"

"github.com/btcsuite/btclog"
"github.com/dcrdata/dcrdata/db/dcrsqlite"
"github.com/dcrdata/dcrdata/rpcutils"
"github.com/dcrdata/dcrdata/stakedb"
"github.com/decred/dcrd/rpcclient"
"github.com/decred/dcrdata/db/dcrsqlite"
"github.com/decred/dcrdata/rpcutils"
"github.com/decred/dcrdata/stakedb"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/rebuilddb2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ Be able to build dcrdata (see [../../README.md](../../README.md#build-from-sourc

* Clone the dcrdata repository

git clone https://github.com/dcrdata/dcrdata $GOPATH/src/github.com/dcrdata/dcrdata
git clone https://github.com/decred/dcrdata $GOPATH/src/github.com/decred/dcrdata

* Populate vendor folder with `dep ensure`

cd $GOPATH/src/github.com/dcrdata/dcrdata
cd $GOPATH/src/github.com/decred/dcrdata
dep ensure

* Build `rebuilddb2`

# build rebuilddb2 executable in workspace:
cd $GOPATH/src/github.com/dcrdata/dcrdata/cmd/rebuilddb2
cd $GOPATH/src/github.com/decred/dcrdata/cmd/rebuilddb2
go build
# or to install dcrdata and other tools into $GOPATH/bin:
go install ./cmd/rebuilddb2
Expand Down
4 changes: 2 additions & 2 deletions cmd/rebuilddb2/rebuilddb2.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"time"

"github.com/btcsuite/btclog"
"github.com/dcrdata/dcrdata/db/dcrpg"
"github.com/dcrdata/dcrdata/rpcutils"
"github.com/decred/dcrd/rpcclient"
"github.com/decred/dcrdata/db/dcrpg"
"github.com/decred/dcrdata/rpcutils"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/scanblocks/scanblocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"strconv"

"github.com/btcsuite/btclog"
apitypes "github.com/dcrdata/dcrdata/dcrdataapi"
"github.com/dcrdata/dcrdata/rpcutils"
"github.com/dcrdata/dcrdata/txhelpers"
"github.com/decred/dcrd/blockchain"
"github.com/decred/dcrd/chaincfg"
"github.com/decred/dcrd/dcrutil"
"github.com/decred/dcrd/rpcclient"
apitypes "github.com/decred/dcrdata/dcrdataapi"
"github.com/decred/dcrdata/rpcutils"
"github.com/decred/dcrdata/txhelpers"
)

var host = flag.String("host", "127.0.0.1:9109", "node RPC host:port")
Expand Down
2 changes: 1 addition & 1 deletion db/dbtypes/conversion.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dbtypes

import (
"github.com/dcrdata/dcrdata/txhelpers"
"github.com/decred/dcrd/chaincfg"
"github.com/decred/dcrd/wire"
"github.com/decred/dcrdata/txhelpers"
)

// MsgBlockToDBBlock creates a dbtypes.Block from a wire.MsgBlock
Expand Down
2 changes: 1 addition & 1 deletion db/dbtypes/extraction.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"encoding/hex"
"fmt"

"github.com/dcrdata/dcrdata/txhelpers"
"github.com/decred/dcrd/blockchain/stake"
"github.com/decred/dcrd/chaincfg"
"github.com/decred/dcrd/txscript"
"github.com/decred/dcrd/wire"
"github.com/decred/dcrdata/txhelpers"
)

// DevSubsidyAddress returns the development subsidy address for the specified
Expand Down
2 changes: 1 addition & 1 deletion db/dbtypes/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"strconv"

"github.com/dcrdata/dcrdata/db/dbtypes/internal"
"github.com/decred/dcrdata/db/dbtypes/internal"
)

// SyncResult is the result of a database sync operation, containing the height
Expand Down
2 changes: 1 addition & 1 deletion db/dcrpg/internal/blockstmts.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package internal
import (
"fmt"

"github.com/dcrdata/dcrdata/db/dbtypes"
"github.com/decred/dcrdata/db/dbtypes"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion db/dcrpg/internal/vinoutstmts.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/hex"
"fmt"

"github.com/dcrdata/dcrdata/db/dbtypes"
"github.com/decred/dcrdata/db/dbtypes"
"github.com/lib/pq"
)

Expand Down
6 changes: 3 additions & 3 deletions db/dcrpg/pgblockchain.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"sync"
"time"

"github.com/dcrdata/dcrdata/blockdata"
"github.com/dcrdata/dcrdata/db/dbtypes"
"github.com/dcrdata/dcrdata/explorer"
"github.com/decred/dcrd/chaincfg"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/dcrutil"
"github.com/decred/dcrd/wire"
"github.com/decred/dcrdata/blockdata"
"github.com/decred/dcrdata/db/dbtypes"
"github.com/decred/dcrdata/explorer"
humanize "github.com/dustin/go-humanize"
)

Expand Down
4 changes: 2 additions & 2 deletions db/dcrpg/queries.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"database/sql"
"fmt"

"github.com/dcrdata/dcrdata/db/dbtypes"
"github.com/dcrdata/dcrdata/db/dcrpg/internal"
"github.com/decred/dcrdata/db/dbtypes"
"github.com/decred/dcrdata/db/dcrpg/internal"
"github.com/lib/pq"
)

Expand Down
4 changes: 2 additions & 2 deletions db/dcrpg/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"sync"
"time"

"github.com/dcrdata/dcrdata/db/dbtypes"
"github.com/dcrdata/dcrdata/rpcutils"
"github.com/decred/dcrd/rpcclient"
"github.com/decred/dcrdata/db/dbtypes"
"github.com/decred/dcrdata/rpcutils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion db/dcrpg/tables.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"regexp"
"strconv"

"github.com/dcrdata/dcrdata/db/dcrpg/internal"
"github.com/decred/dcrdata/db/dcrpg/internal"
)

var createTableStatements = map[string]string{
Expand Down
14 changes: 7 additions & 7 deletions db/dcrsqlite/apisource.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ import (
"sync"
"time"

"github.com/dcrdata/dcrdata/db/dbtypes"
apitypes "github.com/dcrdata/dcrdata/dcrdataapi"
"github.com/dcrdata/dcrdata/explorer"
"github.com/dcrdata/dcrdata/mempool"
"github.com/dcrdata/dcrdata/rpcutils"
"github.com/dcrdata/dcrdata/stakedb"
"github.com/dcrdata/dcrdata/txhelpers"
"github.com/decred/dcrd/blockchain/stake"
"github.com/decred/dcrd/chaincfg"
"github.com/decred/dcrd/chaincfg/chainhash"
Expand All @@ -28,6 +21,13 @@ import (
"github.com/decred/dcrd/rpcclient"
"github.com/decred/dcrd/txscript"
"github.com/decred/dcrd/wire"
"github.com/decred/dcrdata/db/dbtypes"
apitypes "github.com/decred/dcrdata/dcrdataapi"
"github.com/decred/dcrdata/explorer"
"github.com/decred/dcrdata/mempool"
"github.com/decred/dcrdata/rpcutils"
"github.com/decred/dcrdata/stakedb"
"github.com/decred/dcrdata/txhelpers"
"github.com/dustin/go-humanize"
)

Expand Down
2 changes: 1 addition & 1 deletion db/dcrsqlite/chainmonitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"sync"

"github.com/dcrdata/dcrdata/blockdata"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrdata/blockdata"
)

// ReorgData contains the information from a reoranization notification
Expand Down
4 changes: 2 additions & 2 deletions db/dcrsqlite/sqlite.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"sync"

"github.com/btcsuite/btclog"
"github.com/dcrdata/dcrdata/blockdata"
apitypes "github.com/dcrdata/dcrdata/dcrdataapi"
"github.com/decred/dcrd/wire"
"github.com/decred/dcrdata/blockdata"
apitypes "github.com/decred/dcrdata/dcrdataapi"
_ "github.com/mattn/go-sqlite3" // register sqlite driver with database/sql
)

Expand Down
4 changes: 2 additions & 2 deletions db/dcrsqlite/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"fmt"
"time"

apitypes "github.com/dcrdata/dcrdata/dcrdataapi"
"github.com/dcrdata/dcrdata/txhelpers"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/dcrutil"
apitypes "github.com/decred/dcrdata/dcrdataapi"
"github.com/decred/dcrdata/txhelpers"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion dcrdataapi/apitypes.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package dcrdataapi

import (
"github.com/dcrdata/dcrdata/txhelpers"
"github.com/decred/dcrd/dcrjson"
"github.com/decred/dcrdata/txhelpers"
)

// much of the time, dcrdata will be using the types in dcrjson, but others are
Expand Down
2 changes: 1 addition & 1 deletion dev/relaunch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ killall -w -INT dcrdata
sleep 1

echo 'Rebuilding...'
cd $GOPATH/src/github.com/dcrdata/dcrdata
cd $GOPATH/src/github.com/decred/dcrdata

git diff --no-ext-diff --quiet --exit-code
if [ $? -ne 0 ]; then
Expand Down
6 changes: 3 additions & 3 deletions explorer/explorer.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import (
"sync"
"time"

"github.com/dcrdata/dcrdata/blockdata"
"github.com/dcrdata/dcrdata/db/dbtypes"
"github.com/dcrdata/dcrdata/mempool"
"github.com/decred/dcrd/chaincfg"
"github.com/decred/dcrd/dcrjson"
"github.com/decred/dcrd/dcrutil"
"github.com/decred/dcrd/wire"
"github.com/decred/dcrdata/blockdata"
"github.com/decred/dcrdata/db/dbtypes"
"github.com/decred/dcrdata/mempool"
humanize "github.com/dustin/go-humanize"
"github.com/go-chi/chi"
"github.com/go-chi/chi/middleware"
Expand Down
Loading

0 comments on commit e151343

Please sign in to comment.