Skip to content

Commit

Permalink
Change go package to github.com/cybercongress/cyberd
Browse files Browse the repository at this point in the history
  • Loading branch information
hleb-albau committed Nov 28, 2018
1 parent 78b3490 commit 43d3e49
Show file tree
Hide file tree
Showing 41 changed files with 67 additions and 70 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.11-alpine as builder

WORKDIR $GOPATH/src/github.com/cybercongress/cyberd/cosmos/poc
COPY cosmos/poc .
WORKDIR $GOPATH/src/github.com/cybercongress/cyberd
COPY ./ ./

RUN apk add --no-cache git

Expand All @@ -21,8 +21,8 @@ COPY --from=builder /go/bin/cyberdproxy /usr/bin/cyberdproxy
COPY start_script.sh start_script.sh
RUN chmod +x start_script.sh

COPY testnet /genesis.json
COPY testnet /config.toml
COPY ./testnet/genesis.json /genesis.json
COPY ./testnet/config.toml /config.toml

EXPOSE 26656 26657 26660

Expand Down
10 changes: 5 additions & 5 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"github.com/cosmos/cosmos-sdk/x/params"
"github.com/cosmos/cosmos-sdk/x/slashing"
"github.com/cosmos/cosmos-sdk/x/stake"
. "github.com/cybercongress/cyberd/cosmos/poc/app/bank"
"github.com/cybercongress/cyberd/cosmos/poc/app/coin"
"github.com/cybercongress/cyberd/cosmos/poc/app/rank"
. "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
cbd "github.com/cybercongress/cyberd/cosmos/poc/app/types"
. "github.com/cybercongress/cyberd/app/bank"
"github.com/cybercongress/cyberd/app/coin"
"github.com/cybercongress/cyberd/app/rank"
. "github.com/cybercongress/cyberd/app/storage"
cbd "github.com/cybercongress/cyberd/app/types"
abci "github.com/tendermint/tendermint/abci/types"
cmn "github.com/tendermint/tendermint/libs/common"
dbm "github.com/tendermint/tendermint/libs/db"
Expand Down
6 changes: 3 additions & 3 deletions app/bank/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
. "github.com/cosmos/cosmos-sdk/x/bank"
"github.com/cybercongress/cyberd/cosmos/poc/app/coin"
"github.com/cybercongress/cyberd/cosmos/poc/app/storage"
cbd "github.com/cybercongress/cyberd/cosmos/poc/app/types"
"github.com/cybercongress/cyberd/app/coin"
"github.com/cybercongress/cyberd/app/storage"
cbd "github.com/cybercongress/cyberd/app/types"
"reflect"
)

Expand Down
4 changes: 2 additions & 2 deletions app/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package app
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
. "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
cbd "github.com/cybercongress/cyberd/cosmos/poc/app/types"
. "github.com/cybercongress/cyberd/app/storage"
cbd "github.com/cybercongress/cyberd/app/types"
)

// NewHandler returns a handler for "link" type messages.
Expand Down
2 changes: 1 addition & 1 deletion app/msgs.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package app

import (
sdk "github.com/cosmos/cosmos-sdk/types"
cbd "github.com/cybercongress/cyberd/cosmos/poc/app/types"
cbd "github.com/cybercongress/cyberd/app/types"
)

type MsgLink struct {
Expand Down
2 changes: 1 addition & 1 deletion app/rank/calculate.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package rank

import (
. "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
. "github.com/cybercongress/cyberd/app/storage"
"github.com/tendermint/tendermint/libs/log"
)

Expand Down
4 changes: 2 additions & 2 deletions app/rank/calculate_cpu.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package rank

import (
. "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
. "github.com/cybercongress/cyberd/cosmos/poc/app/types"
. "github.com/cybercongress/cyberd/app/storage"
. "github.com/cybercongress/cyberd/app/types"
"sync"
)

Expand Down
4 changes: 2 additions & 2 deletions app/rank/calculate_gpu.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
package rank

import (
. "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
cbd "github.com/cybercongress/cyberd/cosmos/poc/app/types"
. "github.com/cybercongress/cyberd/app/storage"
cbd "github.com/cybercongress/cyberd/app/types"
"github.com/tendermint/tendermint/libs/log"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion app/rank/calculate_gpu_nop.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package rank

import (
. "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
. "github.com/cybercongress/cyberd/app/storage"
"github.com/tendermint/tendermint/libs/log"
)

Expand Down
6 changes: 3 additions & 3 deletions app/rank/cuda/test_cpu_gpu_determinism.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package main

import (
"fmt"
cpurank "github.com/cybercongress/cyberd/cosmos/poc/app/rank"
. "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
. "github.com/cybercongress/cyberd/cosmos/poc/app/types"
cpurank "github.com/cybercongress/cyberd/app/rank"
. "github.com/cybercongress/cyberd/app/storage"
. "github.com/cybercongress/cyberd/app/types"
"github.com/tendermint/tendermint/libs/log"
)

Expand Down
4 changes: 2 additions & 2 deletions app/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package app
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
. "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
. "github.com/cybercongress/cyberd/cosmos/poc/app/types"
. "github.com/cybercongress/cyberd/app/storage"
. "github.com/cybercongress/cyberd/app/types"
abci "github.com/tendermint/tendermint/abci/types"
)

Expand Down
4 changes: 2 additions & 2 deletions app/storage/acc.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package storage
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
"github.com/cybercongress/cyberd/cosmos/poc/app/coin"
cbd "github.com/cybercongress/cyberd/cosmos/poc/app/types"
"github.com/cybercongress/cyberd/app/coin"
cbd "github.com/cybercongress/cyberd/app/types"
)

// returns all added cids
Expand Down
2 changes: 1 addition & 1 deletion app/storage/cids.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package storage
import (
"encoding/binary"
sdk "github.com/cosmos/cosmos-sdk/types"
. "github.com/cybercongress/cyberd/cosmos/poc/app/types"
. "github.com/cybercongress/cyberd/app/types"
)

type CidIndexStorage struct {
Expand Down
2 changes: 1 addition & 1 deletion app/storage/inmemory.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package storage
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
. "github.com/cybercongress/cyberd/cosmos/poc/app/types"
. "github.com/cybercongress/cyberd/app/types"
"github.com/pkg/errors"
cmn "github.com/tendermint/tendermint/libs/common"
"sort"
Expand Down
2 changes: 1 addition & 1 deletion app/storage/links.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package storage
import (
"encoding/binary"
sdk "github.com/cosmos/cosmos-sdk/types"
cbd "github.com/cybercongress/cyberd/cosmos/poc/app/types"
cbd "github.com/cybercongress/cyberd/app/types"
)

type LinksStorage struct {
Expand Down
2 changes: 1 addition & 1 deletion claim/claim.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"fmt"
"github.com/cybercongress/cyberd/cosmos/poc/claim/client"
"github.com/cybercongress/cyberd/claim/client"
"github.com/mitchellh/go-homedir"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
4 changes: 2 additions & 2 deletions claim/client/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"github.com/cosmos/cosmos-sdk/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/bank/client"
"github.com/cybercongress/cyberd/cosmos/poc/claim/context"
"github.com/cybercongress/cyberd/cosmos/poc/http/util"
"github.com/cybercongress/cyberd/claim/context"
"github.com/cybercongress/cyberd/http/util"
"github.com/pkg/errors"
"net"
"net/http"
Expand Down
4 changes: 2 additions & 2 deletions claim/client/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package client
import (
"fmt"
"github.com/TV4/graceful"
"github.com/cybercongress/cyberd/cosmos/poc/claim/common"
"github.com/cybercongress/cyberd/cosmos/poc/claim/context"
"github.com/cybercongress/cyberd/claim/common"
"github.com/cybercongress/cyberd/claim/context"
"github.com/rs/cors"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
4 changes: 2 additions & 2 deletions claim/context/ctx.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/types"
authtxb "github.com/cosmos/cosmos-sdk/x/auth/client/txbuilder"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/cosmos/poc/claim/common"
"github.com/cybercongress/cyberd/app"
"github.com/cybercongress/cyberd/claim/common"
"github.com/pkg/errors"
"github.com/spf13/viper"
rpcclient "github.com/tendermint/tendermint/rpc/client"
Expand Down
2 changes: 1 addition & 1 deletion cyberd/init/collect.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package init

import (
"encoding/json"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/app"
"path/filepath"

"github.com/cosmos/cosmos-sdk/client"
Expand Down
2 changes: 1 addition & 1 deletion cyberd/init/genesis_accts.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package init

import (
"fmt"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/app"

"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/server"
Expand Down
2 changes: 1 addition & 1 deletion cyberd/init/gentx.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
"github.com/cosmos/cosmos-sdk/x/stake/client/cli"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/app"
"github.com/spf13/cobra"
"github.com/spf13/viper"
cfg "github.com/tendermint/tendermint/config"
Expand Down
2 changes: 1 addition & 1 deletion cyberd/init/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package init
import (
"encoding/json"
"fmt"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/app"
"os"
"path/filepath"

Expand Down
2 changes: 1 addition & 1 deletion cyberd/init/testnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package init
import (
"encoding/json"
"fmt"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/app"
"net"
"os"
"path/filepath"
Expand Down
2 changes: 1 addition & 1 deletion cyberd/init/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package init
import (
"encoding/json"
"fmt"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/app"
"io/ioutil"
"time"

Expand Down
8 changes: 4 additions & 4 deletions cyberd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"encoding/json"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/server"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/cosmos/poc/app/rank"
initCyberd "github.com/cybercongress/cyberd/cosmos/poc/cyberd/init"
"github.com/cybercongress/cyberd/cosmos/poc/cyberd/rpc"
"github.com/cybercongress/cyberd/app"
"github.com/cybercongress/cyberd/app/rank"
initCyberd "github.com/cybercongress/cyberd/cyberd/init"
"github.com/cybercongress/cyberd/cyberd/rpc"
"github.com/spf13/cobra"
"github.com/spf13/viper"
abci "github.com/tendermint/tendermint/abci/types"
Expand Down
2 changes: 1 addition & 1 deletion cyberd/rpc/routes.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package rpc

import (
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/app"
"github.com/tendermint/tendermint/rpc/core"
"github.com/tendermint/tendermint/rpc/lib/server"
)
Expand Down
2 changes: 1 addition & 1 deletion cyberd/rpc/search.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package rpc

import "github.com/cybercongress/cyberd/cosmos/poc/app/storage"
import "github.com/cybercongress/cyberd/app/storage"

type ResultSearch struct {
Cids []storage.RankedCid `json:"cids"`
Expand Down
4 changes: 2 additions & 2 deletions cyberdcli/commands/linktx.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
authtxb "github.com/cosmos/cosmos-sdk/x/auth/client/txbuilder"
cbd "github.com/cybercongress/cyberd/cosmos/poc/app/types"
. "github.com/cybercongress/cyberd/cosmos/poc/cyberdcli/util"
cbd "github.com/cybercongress/cyberd/app/types"
. "github.com/cybercongress/cyberd/cyberdcli/util"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
4 changes: 2 additions & 2 deletions cyberdcli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli"
slashingcmd "github.com/cosmos/cosmos-sdk/x/slashing/client/cli"
stakecmd "github.com/cosmos/cosmos-sdk/x/stake/client/cli"
"github.com/cybercongress/cyberd/cosmos/poc/app"
cyberdcmd "github.com/cybercongress/cyberd/cosmos/poc/cyberdcli/commands"
"github.com/cybercongress/cyberd/app"
cyberdcmd "github.com/cybercongress/cyberd/cyberdcli/commands"
"github.com/spf13/cobra"
"github.com/tendermint/tendermint/libs/cli"
)
Expand Down
4 changes: 2 additions & 2 deletions cyberdcli/util/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package util

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cybercongress/cyberd/cosmos/poc/app"
cbd "github.com/cybercongress/cyberd/cosmos/poc/app/types"
"github.com/cybercongress/cyberd/app"
cbd "github.com/cybercongress/cyberd/app/types"
)

// build the sendTx msg
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/cybercongress/cyberd/cosmos/poc
module github.com/cybercongress/cyberd

require (
github.com/BurntSushi/toml v0.3.1 // indirect
Expand Down
3 changes: 0 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ github.com/btcsuite/btcd v0.0.0-20180903232927-cff30e1d23fc/go.mod h1:Dmm/EzmjnC
github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a h1:RQMUrEILyYJEoAT34XS/kLu40vC0+po/UfxrBBA4qZE=
github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cosmos/cosmos-sdk v0.0.0-20181018195818-505c356f20d0 h1:CzP/5OIVq2/yFZ38jF/Sjior/YSy6XxYw97fLHdy6Xg=
github.com/cosmos/cosmos-sdk v0.0.0-20181018195818-505c356f20d0/go.mod h1:JrX/JpJunJQXBI5PEX2zELHMFzQr/159jDjIhesOh2c=
github.com/cosmos/cosmos-sdk v0.26.0/go.mod h1:JrX/JpJunJQXBI5PEX2zELHMFzQr/159jDjIhesOh2c=
github.com/cosmos/cosmos-sdk v0.26.1-rc1 h1:OLFzEbZ9SJC9NaCaqyvSWev3YdhoI5NayX4lLxsqtGs=
github.com/cosmos/cosmos-sdk v0.26.1-rc1/go.mod h1:JrX/JpJunJQXBI5PEX2zELHMFzQr/159jDjIhesOh2c=
github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8 h1:Iwin12wRQtyZhH6FV3ykFcdGNlYEzoeR0jN8Vn+JWsI=
Expand Down
2 changes: 1 addition & 1 deletion proxy/client/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package client
import (
"fmt"
"github.com/TV4/graceful"
"github.com/cybercongress/cyberd/cosmos/poc/proxy/core"
"github.com/cybercongress/cyberd/proxy/core"
"github.com/rs/cors"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion proxy/core/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package core
import (
"encoding/json"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/app"
"github.com/tendermint/tendermint/rpc/client"
"io/ioutil"
"net/http"
Expand Down
2 changes: 1 addition & 1 deletion proxy/core/get.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package core

import (
"github.com/cybercongress/cyberd/cosmos/poc/http/util"
"github.com/cybercongress/cyberd/http/util"
"net/http"
"net/url"
)
Expand Down
2 changes: 1 addition & 1 deletion proxy/core/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
"github.com/cosmos/cosmos-sdk/x/bank"
"github.com/cybercongress/cyberd/cosmos/poc/app"
"github.com/cybercongress/cyberd/app"
)

type TxRequest interface {
Expand Down
2 changes: 1 addition & 1 deletion proxy/core/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package core

import (
"github.com/cosmos/cosmos-sdk/x/auth"
"github.com/cybercongress/cyberd/cosmos/poc/http/util"
"github.com/cybercongress/cyberd/http/util"
"io/ioutil"
"net/http"
)
Expand Down
Loading

0 comments on commit 43d3e49

Please sign in to comment.