Skip to content

WIP: update for proper builds #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

WIP: update for proper builds #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50fd233
paths updated
sigrlami Nov 5, 2020
309e63b
update deps to latest fat
sigrlami Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions accounting/accountant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"sync"

"github.com/FactomWyomingEntity/prosper-pool/config"
"github.com/FactomWyomingEntity/prosper-pool/difficulty"
"github.com/FactomWyomingEntity/prosper-pool/stratum"
"github.com/pegnet/PegNetPool/config"
"github.com/pegnet/PegNetPool/difficulty"
"github.com/pegnet/PegNetPool/stratum"
"github.com/jinzhu/gorm"
"github.com/shopspring/decimal"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion accounting/pay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"database/sql"
"fmt"

"github.com/FactomWyomingEntity/prosper-pool/authentication"
"github.com/pegnet/PegNetPool/authentication"
"github.com/jinzhu/gorm"
)

Expand Down
2 changes: 1 addition & 1 deletion accounting/share.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sort"
"time"

"github.com/FactomWyomingEntity/prosper-pool/difficulty"
"github.com/pegnet/PegNetPool/difficulty"
"github.com/shopspring/decimal"
)

Expand Down
2 changes: 1 addition & 1 deletion accounting/share_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/shopspring/decimal"

. "github.com/FactomWyomingEntity/prosper-pool/accounting"
. "github.com/pegnet/PegNetPool/accounting"
)

func TestShareMap(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions accounting/simulation/esthashrate/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"sync"
"time"

"github.com/FactomWyomingEntity/prosper-pool/accounting"
"github.com/FactomWyomingEntity/prosper-pool/difficulty"
"github.com/pegnet/PegNetPool/accounting"
"github.com/pegnet/PegNetPool/difficulty"
)

var _ = crand.Int
Expand Down
2 changes: 1 addition & 1 deletion authentication/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/qor/mailer"

. "github.com/FactomWyomingEntity/prosper-pool/authentication"
. "github.com/pegnet/PegNetPool/authentication"
"github.com/jinzhu/gorm"
_ "github.com/jinzhu/gorm/dialects/sqlite"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

go install -ldflags="-X github.com/FactomWyomingEntity/prosper-pool/config.CompiledInBuild=`git rev-parse HEAD` -X github.com/FactomWyomingEntity/prosper-pool/config.CompiledInVersion=`git describe --tags`"
go install -ldflags="-X github.com/pegnet/PegNetPool/config.CompiledInBuild=`git rev-parse HEAD` -X github.com/pegnet/PegNetPool/config.CompiledInVersion=`git describe --tags`"
8 changes: 4 additions & 4 deletions cmd/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"io/ioutil"
"os"

"github.com/FactomWyomingEntity/prosper-pool/web"
"github.com/pegnet/PegNetPool/web"

"github.com/FactomWyomingEntity/prosper-pool/accounting"
"github.com/pegnet/PegNetPool/accounting"

"github.com/Factom-Asset-Tokens/base58"
"github.com/FactomWyomingEntity/prosper-pool/authentication"
"github.com/FactomWyomingEntity/prosper-pool/database"
"github.com/pegnet/PegNetPool/authentication"
"github.com/pegnet/PegNetPool/database"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
22 changes: 11 additions & 11 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import (
"strings"
"time"

"github.com/FactomWyomingEntity/prosper-pool/accounting"
"github.com/FactomWyomingEntity/prosper-pool/authentication"
"github.com/FactomWyomingEntity/prosper-pool/config"
"github.com/FactomWyomingEntity/prosper-pool/database"
"github.com/FactomWyomingEntity/prosper-pool/engine"
"github.com/FactomWyomingEntity/prosper-pool/exit"
"github.com/FactomWyomingEntity/prosper-pool/loghelp"
"github.com/FactomWyomingEntity/prosper-pool/pegnet"
"github.com/FactomWyomingEntity/prosper-pool/polling"
"github.com/FactomWyomingEntity/prosper-pool/profile"
"github.com/FactomWyomingEntity/prosper-pool/stratum"
"github.com/pegnet/PegNetPool/accounting"
"github.com/pegnet/PegNetPool/authentication"
"github.com/pegnet/PegNetPool/config"
"github.com/pegnet/PegNetPool/database"
"github.com/pegnet/PegNetPool/engine"
"github.com/pegnet/PegNetPool/exit"
"github.com/pegnet/PegNetPool/loghelp"
"github.com/pegnet/PegNetPool/pegnet"
"github.com/pegnet/PegNetPool/polling"
"github.com/pegnet/PegNetPool/profile"
"github.com/pegnet/PegNetPool/stratum"
"github.com/pegnet/pegnet/modules/opr"
"github.com/qor/session/manager"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion cmd/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd_test
import (
"testing"

. "github.com/FactomWyomingEntity/prosper-pool/cmd"
. "github.com/pegnet/PegNetPool/cmd"
)

func TestAssetListContainsCaseInsensitive(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion database/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"
"strings"

"github.com/FactomWyomingEntity/prosper-pool/config"
"github.com/pegnet/PegNetPool/config"
"github.com/jinzhu/gorm"
_ "github.com/jinzhu/gorm/dialects/postgres"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion difficulty/difficulty_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

. "github.com/FactomWyomingEntity/prosper-pool/difficulty"
. "github.com/pegnet/PegNetPool/difficulty"
)

var _ = crand.Read
Expand Down
24 changes: 12 additions & 12 deletions engine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ import (
"github.com/pegnet/pegnet/modules/factoidaddress"

"github.com/Factom-Asset-Tokens/factom"
"github.com/FactomWyomingEntity/prosper-pool/accounting"
"github.com/FactomWyomingEntity/prosper-pool/authentication"
"github.com/FactomWyomingEntity/prosper-pool/config"
"github.com/FactomWyomingEntity/prosper-pool/database"
"github.com/FactomWyomingEntity/prosper-pool/exit"
"github.com/FactomWyomingEntity/prosper-pool/factomclient"
"github.com/FactomWyomingEntity/prosper-pool/minutekeeper"
"github.com/FactomWyomingEntity/prosper-pool/pegnet"
"github.com/FactomWyomingEntity/prosper-pool/polling"
"github.com/FactomWyomingEntity/prosper-pool/sharesubmit"
"github.com/FactomWyomingEntity/prosper-pool/stratum"
"github.com/FactomWyomingEntity/prosper-pool/web"
"github.com/pegnet/PegNetPool/accounting"
"github.com/pegnet/PegNetPool/authentication"
"github.com/pegnet/PegNetPool/config"
"github.com/pegnet/PegNetPool/database"
"github.com/pegnet/PegNetPool/exit"
"github.com/pegnet/PegNetPool/factomclient"
"github.com/pegnet/PegNetPool/minutekeeper"
"github.com/pegnet/PegNetPool/pegnet"
"github.com/pegnet/PegNetPool/polling"
"github.com/pegnet/PegNetPool/sharesubmit"
"github.com/pegnet/PegNetPool/stratum"
"github.com/pegnet/PegNetPool/web"
"github.com/pegnet/pegnet/modules/opr"
log "github.com/sirupsen/logrus"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion factomclient/factom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package factomclient

import (
"github.com/Factom-Asset-Tokens/factom"
"github.com/FactomWyomingEntity/prosper-pool/config"
"github.com/pegnet/PegNetPool/config"
"github.com/spf13/viper"
)

Expand Down
12 changes: 7 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
module github.com/FactomWyomingEntity/prosper-pool
module github.com/pegnet/PegNetPool

go 1.13

require (
github.com/Factom-Asset-Tokens/base58 v0.0.0-20181227014902-61655c4dd885
github.com/Factom-Asset-Tokens/factom v0.0.0-20191120022136-7bf60a31a324
github.com/Factom-Asset-Tokens/base58 v0.0.0-20191118025050-4fa02e92ec20
github.com/Factom-Asset-Tokens/factom v0.0.0-20200222022020-d06cbcfe6ece
github.com/Factom-Asset-Tokens/fatd v1.1.4
github.com/andybalholm/cascadia v1.1.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/aws/aws-sdk-go v1.25.12 // indirect
Expand All @@ -21,9 +22,10 @@ require (
github.com/mattn/go-colorable v0.1.4 // indirect
github.com/mattn/go-isatty v0.0.10 // indirect
github.com/microcosm-cc/bluemonday v1.0.2 // indirect
github.com/mitchellh/gox v1.0.1 // indirect
github.com/pegnet/LXRHash v0.0.0-20200205233914-cceb516c4b7f
github.com/pegnet/pegnet v0.5.1-0.20200828161600-edf138a7971f
github.com/pegnet/pegnetd v0.1.2-0.20191011183044-5eca2d08a5e8
github.com/pegnet/pegnetd v0.5.3-0.20200828161939-098da4b7494b
github.com/prometheus/client_golang v1.0.0
github.com/qor/admin v0.0.0-20190906081516-5593fc33b920 // indirect
github.com/qor/assetfs v0.0.0-20170713023933-ff57fdc13a14 // indirect
Expand All @@ -47,7 +49,7 @@ require (
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24
github.com/sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.5
github.com/spf13/viper v1.4.0
github.com/spf13/viper v1.6.2
github.com/stretchr/testify v1.4.0
github.com/theplant/cldr v0.0.0-20190423050709-9f76f7ce4ee8 // indirect
github.com/theplant/htmltestingutils v0.0.0-20190423050759-0e06de7b6967 // indirect
Expand Down
Loading