Merge pull request #3189 from NebulousLabs/revert

revert to c222a06

.github/CONTRIBUTING.md

@@ -2,6 +2,6 @@ Interested in contributing to Sia?
 ==================================
 
 Please review the contributing guidelines in the following pages:
-- [Guide to Contributing to Sia](https://gitlab.com/NebulousLabs/Sia/blob/master/doc/Guide%20to%20Contributing%20to%20Sia.md)
-- [Developers](https://gitlab.com/NebulousLabs/Sia/blob/master/doc/Developers.md)
-- [All Documentation](https://gitlab.com/NebulousLabs/Sia/tree/master/doc)
+- [Guide to Contributing to Sia](https://github.com/NebulousLabs/Sia/blob/master/doc/Guide%20to%20Contributing%20to%20Sia.md)
+- [Developers](https://github.com/NebulousLabs/Sia/blob/master/doc/Developers.md)
+- [All Documentation](https://github.com/NebulousLabs/Sia/tree/master/doc)

Makefile

@@ -3,8 +3,8 @@ BUILD_TIME=$(shell date)
 GIT_REVISION=$(shell git rev-parse --short HEAD)
 GIT_DIRTY=$(shell git diff-index --quiet HEAD -- || echo "✗-")
 
-ldflags= -X gitlab.com/NebulousLabs/Sia/build.GitRevision=${GIT_DIRTY}${GIT_REVISION} \
--X "gitlab.com/NebulousLabs/Sia/build.BuildTime=${BUILD_TIME}"
+ldflags= -X github.com/NebulousLabs/Sia/build.GitRevision=${GIT_DIRTY}${GIT_REVISION} \
+-X "github.com/NebulousLabs/Sia/build.BuildTime=${BUILD_TIME}"
 
 # all will build and install release binaries
 all: release
@@ -13,19 +13,19 @@ all: release
 # Sia.
 dependencies:
 	# Consensus Dependencies
-	go get -u gitlab.com/NebulousLabs/demotemutex
-	go get -u gitlab.com/NebulousLabs/fastrand
-	go get -u gitlab.com/NebulousLabs/merkletree
-	go get -u gitlab.com/NebulousLabs/bolt
+	go get -u github.com/NebulousLabs/demotemutex
+	go get -u github.com/NebulousLabs/fastrand
+	go get -u github.com/NebulousLabs/merkletree
+	go get -u github.com/NebulousLabs/bolt
 	go get -u golang.org/x/crypto/blake2b
 	go get -u golang.org/x/crypto/ed25519
 	# Module + Daemon Dependencies
-	go get -u gitlab.com/NebulousLabs/entropy-mnemonics
-	go get -u gitlab.com/NebulousLabs/errors
-	go get -u gitlab.com/NebulousLabs/go-upnp
-	go get -u gitlab.com/NebulousLabs/ratelimit
-	go get -u gitlab.com/NebulousLabs/threadgroup
-	go get -u gitlab.com/NebulousLabs/writeaheadlog
+	go get -u github.com/NebulousLabs/entropy-mnemonics
+	go get -u github.com/NebulousLabs/errors
+	go get -u github.com/NebulousLabs/go-upnp
+	go get -u github.com/NebulousLabs/ratelimit
+	go get -u github.com/NebulousLabs/threadgroup
+	go get -u github.com/NebulousLabs/writeaheadlog
 	go get -u github.com/klauspost/reedsolomon
 	go get -u github.com/julienschmidt/httprouter
 	go get -u github.com/inconshreveable/go-update
@@ -38,7 +38,7 @@ dependencies:
 	go install -race std
 	go get -u github.com/client9/misspell/cmd/misspell
 	go get -u github.com/golang/lint/golint
-	go get -u gitlab.com/NebulousLabs/glyphcheck
+	go get -u github.com/NebulousLabs/glyphcheck
 
 # pkgs changes which packages the makefile calls operate on. run changes which
 # tests are run during testing.
@@ -83,10 +83,6 @@ release:
 release-race:
 	go install -race -tags='netgo' -a -ldflags='-s -w $(ldflags)' $(pkgs)
 
-# deploy builds release binaries for every platform.
-deploy:
-	./deploy.sh
-
 # clean removes all directories that get automatically created during
 # development.
 clean:
@@ -97,11 +93,9 @@ test:
 test-v:
 	go test -race -v -short -tags='debug testing netgo' -timeout=15s $(pkgs) -run=$(run)
 test-long: clean fmt vet lint
-	@mkdir -p cover
-	go test --coverprofile='./cover/cover.out' -v -race -tags='testing debug netgo' -timeout=1200s $(pkgs) -run=$(run)
+	go test -v -race -tags='testing debug netgo' -timeout=500s $(pkgs) -run=$(run)
 test-vlong: clean fmt vet lint
-	@mkdir -p cover
-	go test --coverprofile='./cover/cover.out' -v -race -tags='testing debug vlong netgo' -timeout=5000s $(pkgs) -run=$(run)
+	go test -v -race -tags='testing debug vlong netgo' -timeout=5000s $(pkgs) -run=$(run)
 test-cpu:
 	go test -v -tags='testing debug netgo' -timeout=500s -cpuprofile cpu.prof $(pkgs) -run=$(run)
 test-mem:

README.md

@@ -1,8 +1,8 @@
 # [![Sia Logo](http://sia.tech/img/svg/sia-green-logo.svg)](http://sia.tech) v1.3.3 (Capricorn)
 
 [![Build Status](https://travis-ci.org/NebulousLabs/Sia.svg?branch=master)](https://travis-ci.org/NebulousLabs/Sia)
-[![GoDoc](https://godoc.org/gitlab.com/NebulousLabs/Sia?status.svg)](https://godoc.org/gitlab.com/NebulousLabs/Sia)
-[![Go Report Card](https://goreportcard.com/badge/gitlab.com/NebulousLabs/Sia)](https://goreportcard.com/report/gitlab.com/NebulousLabs/Sia)
+[![GoDoc](https://godoc.org/github.com/NebulousLabs/Sia?status.svg)](https://godoc.org/github.com/NebulousLabs/Sia)
+[![Go Report Card](https://goreportcard.com/badge/github.com/NebulousLabs/Sia)](https://goreportcard.com/report/github.com/NebulousLabs/Sia)
 
 Sia is a new decentralized cloud storage platform that radically alters the
 landscape of cloud storage. By leveraging smart contracts, client-side
@@ -70,7 +70,7 @@ as a sole means of storing important data.
 This release comes with 2 binaries, siad and siac. siad is a background
 service, or "daemon," that runs the Sia protocol and exposes an HTTP API on
 port 9980. siac is a command-line client that can be used to interact with
-siad in a user-friendly way. There is also a graphical client, [Sia-UI](https://gitlab.com/NebulousLabs/Sia-UI), which
+siad in a user-friendly way. There is also a graphical client, [Sia-UI](https://github.com/NebulousLabs/Sia-UI), which
 is the preferred way of using Sia for most users. For interested developers,
 the siad API is documented [here](doc/API.md).
 
@@ -92,7 +92,7 @@ To build from source, [Go 1.10 must be installed](https://golang.org/doc/install
 on the system. Make sure your `$GOPATH` is set, and then simply use `go get`:
 
 ```
-go get -u gitlab.com/NebulousLabs/Sia/...
+go get -u github.com/NebulousLabs/Sia/...
 ```
 
 This will download the Sia repo to your `$GOPATH/src` folder and install the

build/critical.go

@@ -11,7 +11,7 @@ import (
 // issue tracker on Github. If the program does not panic, the call stack for
 // the running goroutine is printed to help determine the error.
 func Critical(v ...interface{}) {
-	s := "Critical error: " + fmt.Sprintln(v...) + "Please submit a bug report here: https://gitlab.com/NebulousLabs/Sia/issues\n"
+	s := "Critical error: " + fmt.Sprintln(v...) + "Please submit a bug report here: https://github.com/NebulousLabs/Sia/issues\n"
 	if Release != "testing" {
 		debug.PrintStack()
 		os.Stderr.WriteString(s)

build/critical_test.go

@@ -7,7 +7,7 @@ import (
 // TestCritical checks that a panic is called in debug mode.
 func TestCritical(t *testing.T) {
 	k0 := "critical test killstring"
-	killstring := "Critical error: critical test killstring\nPlease submit a bug report here: https://gitlab.com/NebulousLabs/Sia/issues\n"
+	killstring := "Critical error: critical test killstring\nPlease submit a bug report here: https://github.com/NebulousLabs/Sia/issues\n"
 	defer func() {
 		r := recover()
 		if r != killstring {
@@ -23,7 +23,7 @@ func TestCriticalVariadic(t *testing.T) {
 	k1 := "critical"
 	k2 := "test"
 	k3 := "killstring"
-	killstring := "Critical error: variadic critical test killstring\nPlease submit a bug report here: https://gitlab.com/NebulousLabs/Sia/issues\n"
+	killstring := "Critical error: variadic critical test killstring\nPlease submit a bug report here: https://github.com/NebulousLabs/Sia/issues\n"
 	defer func() {
 		r := recover()
 		if r != killstring {

build/testing_test.go

@@ -9,7 +9,7 @@ import (
 	"sort"
 	"testing"
 
-	"gitlab.com/NebulousLabs/fastrand"
+	"github.com/NebulousLabs/fastrand"
 )
 
 // TestCopyDir checks that CopyDir copies directories as expected.

cmd/siac/consensuscmd.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"gitlab.com/NebulousLabs/Sia/types"
+	"github.com/NebulousLabs/Sia/types"
 )
 
 var (

cmd/siac/consensuscmd_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/NebulousLabs/Sia/types"
+	"github.com/NebulousLabs/Sia/types"
 )
 
 // TestEstimatedHeightAt tests that the expectedHeightAt function correctly

cmd/siac/consts.go

@@ -7,13 +7,9 @@ import (
 const (
 	// OutputRefreshRate is the rate at which siac will update something like a
 	// progress meter when displaying a continuous action like a download.
-	OutputRefreshRate = 250 * time.Millisecond
+	OutputRefreshRate = time.Millisecond * 250
 
 	// RenterDownloadTimeout is the amount of time that needs to elapse before
 	// the download command gives up on finding a download in the download list.
 	RenterDownloadTimeout = time.Minute
-
-	// SpeedEstimationWindow is the size of the window which we use to
-	// determine download speeds.
-	SpeedEstimationWindow = 60 * time.Second
 )

cmd/siac/daemoncmd.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/NebulousLabs/Sia/build"
 	"github.com/spf13/cobra"
-	"gitlab.com/NebulousLabs/Sia/build"
 )
 
 var (

cmd/siac/export.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"gitlab.com/NebulousLabs/Sia/types"
+	"github.com/NebulousLabs/Sia/types"
 
 	"github.com/spf13/cobra"
 )

cmd/siac/gatewaycmd.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"text/tabwriter"
 
+	"github.com/NebulousLabs/Sia/modules"
 	"github.com/spf13/cobra"
-	"gitlab.com/NebulousLabs/Sia/modules"
 )
 
 var (

cmd/siac/hostcmd.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"gitlab.com/NebulousLabs/Sia/crypto"
-	"gitlab.com/NebulousLabs/Sia/modules"
-	"gitlab.com/NebulousLabs/Sia/node/api/client"
-	"gitlab.com/NebulousLabs/Sia/types"
+	"github.com/NebulousLabs/Sia/crypto"
+	"github.com/NebulousLabs/Sia/modules"
+	"github.com/NebulousLabs/Sia/node/api/client"
+	"github.com/NebulousLabs/Sia/types"
 
 	"github.com/spf13/cobra"
 )

cmd/siac/hostdbcmd.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"gitlab.com/NebulousLabs/Sia/modules"
-	"gitlab.com/NebulousLabs/Sia/node/api"
-	"gitlab.com/NebulousLabs/Sia/types"
+	"github.com/NebulousLabs/Sia/modules"
+	"github.com/NebulousLabs/Sia/node/api"
+	"github.com/NebulousLabs/Sia/types"
 )
 
 const scanHistoryLen = 30

cmd/siac/main.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"gitlab.com/NebulousLabs/Sia/build"
-	"gitlab.com/NebulousLabs/Sia/node/api/client"
+	"github.com/NebulousLabs/Sia/build"
+	"github.com/NebulousLabs/Sia/node/api/client"
 )
 
 var (

cmd/siac/parse.go

@@ -7,7 +7,7 @@ import (
 	"math/big"
 	"strings"
 
-	"gitlab.com/NebulousLabs/Sia/types"
+	"github.com/NebulousLabs/Sia/types"
 )
 
 var errUnableToParseSize = errors.New("unable to parse size")

cmd/siac/parse_test.go

@@ -4,7 +4,7 @@ import (
 	"math/big"
 	"testing"
 
-	"gitlab.com/NebulousLabs/Sia/types"
+	"github.com/NebulousLabs/Sia/types"
 )
 
 func TestParseFilesize(t *testing.T) {