Skip to content
This repository was archived by the owner on Nov 2, 2018. It is now read-only.

Commit 86f62a9

Browse files
lukechampinelukechampine
committed
revert to c222a06 
1 parent bad0c40 commit 86f62a9

File tree

390 files changed

+2471
-3231
lines changed

Some content is hidden

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

390 files changed

+2471
-3231
lines changed

‎.github/CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ Interested in contributing to Sia?
22
==================================
33

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

‎.gitlab-ci.yml

-67
This file was deleted.

‎Makefile

+15-21
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ BUILD_TIME=$(shell date)
33
GIT_REVISION=$(shell git rev-parse --short HEAD)
44
GIT_DIRTY=$(shell git diff-index --quiet HEAD -- || echo "✗-")
55

6-
ldflags= -X gitlab.com/NebulousLabs/Sia/build.GitRevision=${GIT_DIRTY}${GIT_REVISION} \
7-
-X "gitlab.com/NebulousLabs/Sia/build.BuildTime=${BUILD_TIME}"
6+
ldflags= -X github.com/NebulousLabs/Sia/build.GitRevision=${GIT_DIRTY}${GIT_REVISION} \
7+
-X "github.com/NebulousLabs/Sia/build.BuildTime=${BUILD_TIME}"
88

99
# all will build and install release binaries
1010
all: release
@@ -13,19 +13,19 @@ all: release
1313
# Sia.
1414
dependencies:
1515
# Consensus Dependencies
16-
go get -u gitlab.com/NebulousLabs/demotemutex
17-
go get -u gitlab.com/NebulousLabs/fastrand
18-
go get -u gitlab.com/NebulousLabs/merkletree
19-
go get -u gitlab.com/NebulousLabs/bolt
16+
go get -u github.com/NebulousLabs/demotemutex
17+
go get -u github.com/NebulousLabs/fastrand
18+
go get -u github.com/NebulousLabs/merkletree
19+
go get -u github.com/NebulousLabs/bolt
2020
go get -u golang.org/x/crypto/blake2b
2121
go get -u golang.org/x/crypto/ed25519
2222
# Module + Daemon Dependencies
23-
go get -u gitlab.com/NebulousLabs/entropy-mnemonics
24-
go get -u gitlab.com/NebulousLabs/errors
25-
go get -u gitlab.com/NebulousLabs/go-upnp
26-
go get -u gitlab.com/NebulousLabs/ratelimit
27-
go get -u gitlab.com/NebulousLabs/threadgroup
28-
go get -u gitlab.com/NebulousLabs/writeaheadlog
23+
go get -u github.com/NebulousLabs/entropy-mnemonics
24+
go get -u github.com/NebulousLabs/errors
25+
go get -u github.com/NebulousLabs/go-upnp
26+
go get -u github.com/NebulousLabs/ratelimit
27+
go get -u github.com/NebulousLabs/threadgroup
28+
go get -u github.com/NebulousLabs/writeaheadlog
2929
go get -u github.com/klauspost/reedsolomon
3030
go get -u github.com/julienschmidt/httprouter
3131
go get -u github.com/inconshreveable/go-update
@@ -38,7 +38,7 @@ dependencies:
3838
go install -race std
3939
go get -u github.com/client9/misspell/cmd/misspell
4040
go get -u github.com/golang/lint/golint
41-
go get -u gitlab.com/NebulousLabs/glyphcheck
41+
go get -u github.com/NebulousLabs/glyphcheck
4242

4343
# pkgs changes which packages the makefile calls operate on. run changes which
4444
# tests are run during testing.
@@ -83,10 +83,6 @@ release:
8383
release-race:
8484
go install -race -tags='netgo' -a -ldflags='-s -w $(ldflags)' $(pkgs)
8585

86-
# deploy builds release binaries for every platform.
87-
deploy:
88-
./deploy.sh
89-
9086
# clean removes all directories that get automatically created during
9187
# development.
9288
clean:
@@ -97,11 +93,9 @@ test:
9793
test-v:
9894
go test -race -v -short -tags='debug testing netgo' -timeout=15s $(pkgs) -run=$(run)
9995
test-long: clean fmt vet lint
100-
@mkdir -p cover
101-
go test --coverprofile='./cover/cover.out' -v -race -tags='testing debug netgo' -timeout=1200s $(pkgs) -run=$(run)
96+
go test -v -race -tags='testing debug netgo' -timeout=500s $(pkgs) -run=$(run)
10297
test-vlong: clean fmt vet lint
103-
@mkdir -p cover
104-
go test --coverprofile='./cover/cover.out' -v -race -tags='testing debug vlong netgo' -timeout=5000s $(pkgs) -run=$(run)
98+
go test -v -race -tags='testing debug vlong netgo' -timeout=5000s $(pkgs) -run=$(run)
10599
test-cpu:
106100
go test -v -tags='testing debug netgo' -timeout=500s -cpuprofile cpu.prof $(pkgs) -run=$(run)
107101
test-mem:

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# [![Sia Logo](http://sia.tech/img/svg/sia-green-logo.svg)](http://sia.tech) v1.3.3 (Capricorn)
22

33
[![Build Status](https://travis-ci.org/NebulousLabs/Sia.svg?branch=master)](https://travis-ci.org/NebulousLabs/Sia)
4-
[![GoDoc](https://godoc.org/gitlab.com/NebulousLabs/Sia?status.svg)](https://godoc.org/gitlab.com/NebulousLabs/Sia)
5-
[![Go Report Card](https://goreportcard.com/badge/gitlab.com/NebulousLabs/Sia)](https://goreportcard.com/report/gitlab.com/NebulousLabs/Sia)
4+
[![GoDoc](https://godoc.org/github.com/NebulousLabs/Sia?status.svg)](https://godoc.org/github.com/NebulousLabs/Sia)
5+
[![Go Report Card](https://goreportcard.com/badge/github.com/NebulousLabs/Sia)](https://goreportcard.com/report/github.com/NebulousLabs/Sia)
66

77
Sia is a new decentralized cloud storage platform that radically alters the
88
landscape of cloud storage. By leveraging smart contracts, client-side
@@ -70,7 +70,7 @@ as a sole means of storing important data.
7070
This release comes with 2 binaries, siad and siac. siad is a background
7171
service, or "daemon," that runs the Sia protocol and exposes an HTTP API on
7272
port 9980. siac is a command-line client that can be used to interact with
73-
siad in a user-friendly way. There is also a graphical client, [Sia-UI](https://gitlab.com/NebulousLabs/Sia-UI), which
73+
siad in a user-friendly way. There is also a graphical client, [Sia-UI](https://github.com/NebulousLabs/Sia-UI), which
7474
is the preferred way of using Sia for most users. For interested developers,
7575
the siad API is documented [here](doc/API.md).
7676

@@ -92,7 +92,7 @@ To build from source, [Go 1.10 must be installed](https://golang.org/doc/install
9292
on the system. Make sure your `$GOPATH` is set, and then simply use `go get`:
9393

9494
```
95-
go get -u gitlab.com/NebulousLabs/Sia/...
95+
go get -u github.com/NebulousLabs/Sia/...
9696
```
9797

9898
This will download the Sia repo to your `$GOPATH/src` folder and install the

‎build/critical.go

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

‎build/critical_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
// TestCritical checks that a panic is called in debug mode.
88
func TestCritical(t *testing.T) {
99
k0 := "critical test killstring"
10-
killstring := "Critical error: critical test killstring\nPlease submit a bug report here: https://gitlab.com/NebulousLabs/Sia/issues\n"
10+
killstring := "Critical error: critical test killstring\nPlease submit a bug report here: https://github.com/NebulousLabs/Sia/issues\n"
1111
defer func() {
1212
r := recover()
1313
if r != killstring {
@@ -23,7 +23,7 @@ func TestCriticalVariadic(t *testing.T) {
2323
k1 := "critical"
2424
k2 := "test"
2525
k3 := "killstring"
26-
killstring := "Critical error: variadic critical test killstring\nPlease submit a bug report here: https://gitlab.com/NebulousLabs/Sia/issues\n"
26+
killstring := "Critical error: variadic critical test killstring\nPlease submit a bug report here: https://github.com/NebulousLabs/Sia/issues\n"
2727
defer func() {
2828
r := recover()
2929
if r != killstring {

‎build/testing_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sort"
1010
"testing"
1111

12-
"gitlab.com/NebulousLabs/fastrand"
12+
"github.com/NebulousLabs/fastrand"
1313
)
1414

1515
// TestCopyDir checks that CopyDir copies directories as expected.

‎cmd/siac/consensuscmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/spf13/cobra"
88

9-
"gitlab.com/NebulousLabs/Sia/types"
9+
"github.com/NebulousLabs/Sia/types"
1010
)
1111

1212
var (

‎cmd/siac/consensuscmd_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55
"time"
66

7-
"gitlab.com/NebulousLabs/Sia/types"
7+
"github.com/NebulousLabs/Sia/types"
88
)
99

1010
// TestEstimatedHeightAt tests that the expectedHeightAt function correctly

‎cmd/siac/consts.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ import (
77
const (
88
// OutputRefreshRate is the rate at which siac will update something like a
99
// progress meter when displaying a continuous action like a download.
10-
OutputRefreshRate = 250 * time.Millisecond
10+
OutputRefreshRate = time.Millisecond * 250
1111

1212
// RenterDownloadTimeout is the amount of time that needs to elapse before
1313
// the download command gives up on finding a download in the download list.
1414
RenterDownloadTimeout = time.Minute
15-
16-
// SpeedEstimationWindow is the size of the window which we use to
17-
// determine download speeds.
18-
SpeedEstimationWindow = 60 * time.Second
1915
)

‎cmd/siac/daemoncmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package main
33
import (
44
"fmt"
55

6+
"github.com/NebulousLabs/Sia/build"
67
"github.com/spf13/cobra"
7-
"gitlab.com/NebulousLabs/Sia/build"
88
)
99

1010
var (

‎cmd/siac/export.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"os"
77

8-
"gitlab.com/NebulousLabs/Sia/types"
8+
"github.com/NebulousLabs/Sia/types"
99

1010
"github.com/spf13/cobra"
1111
)

‎cmd/siac/gatewaycmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66
"text/tabwriter"
77

8+
"github.com/NebulousLabs/Sia/modules"
89
"github.com/spf13/cobra"
9-
"gitlab.com/NebulousLabs/Sia/modules"
1010
)
1111

1212
var (

‎cmd/siac/hostcmd.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"strings"
99
"text/tabwriter"
1010

11-
"gitlab.com/NebulousLabs/Sia/crypto"
12-
"gitlab.com/NebulousLabs/Sia/modules"
13-
"gitlab.com/NebulousLabs/Sia/node/api/client"
14-
"gitlab.com/NebulousLabs/Sia/types"
11+
"github.com/NebulousLabs/Sia/crypto"
12+
"github.com/NebulousLabs/Sia/modules"
13+
"github.com/NebulousLabs/Sia/node/api/client"
14+
"github.com/NebulousLabs/Sia/types"
1515

1616
"github.com/spf13/cobra"
1717
)

‎cmd/siac/hostdbcmd.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
"github.com/spf13/cobra"
1010

11-
"gitlab.com/NebulousLabs/Sia/modules"
12-
"gitlab.com/NebulousLabs/Sia/node/api"
13-
"gitlab.com/NebulousLabs/Sia/types"
11+
"github.com/NebulousLabs/Sia/modules"
12+
"github.com/NebulousLabs/Sia/node/api"
13+
"github.com/NebulousLabs/Sia/types"
1414
)
1515

1616
const scanHistoryLen = 30

‎cmd/siac/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/spf13/cobra"
99

10-
"gitlab.com/NebulousLabs/Sia/build"
11-
"gitlab.com/NebulousLabs/Sia/node/api/client"
10+
"github.com/NebulousLabs/Sia/build"
11+
"github.com/NebulousLabs/Sia/node/api/client"
1212
)
1313

1414
var (

‎cmd/siac/parse.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"math/big"
88
"strings"
99

10-
"gitlab.com/NebulousLabs/Sia/types"
10+
"github.com/NebulousLabs/Sia/types"
1111
)
1212

1313
var errUnableToParseSize = errors.New("unable to parse size")

‎cmd/siac/parse_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"math/big"
55
"testing"
66

7-
"gitlab.com/NebulousLabs/Sia/types"
7+
"github.com/NebulousLabs/Sia/types"
88
)
99

1010
func TestParseFilesize(t *testing.T) {

0 commit comments

Comments
 (0)