Skip to content
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.

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

Remove poc folder #97

Merged
merged 1 commit into from
Nov 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
- run:
name: Build Cyberd Image
command: |
cd cosmos/poc
export GO111MODULE=on
go build -o daemon ./cyberd
go build -o cli ./cyberdcli
Expand Down Expand Up @@ -98,7 +97,6 @@ jobs:
- run:
name: Release Cyberd Binaries
command: |
cd cosmos/poc
export GO111MODULE=on
go build -o cli ./cyberdcli
sudo apt-get update && sudo apt-get install -y rpm
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions cosmos/poc/Dockerfile → 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 . .
COPY cosmos/poc .

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 /genesis.json
COPY ./testnet/config.toml /config.toml
COPY testnet /genesis.json
COPY testnet /config.toml

EXPOSE 26656 26657 26660

Expand Down
4 changes: 2 additions & 2 deletions cosmos/poc/app/app.go → app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
)

const (
APP = "cyberd"
appName = "CyberdApp"
APP = "cyberd"
appName = "CyberdApp"
DefaultKeyPass = "12345678"
)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions cosmos/poc/claim/claim.go → claim/claim.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func main() {
os.Exit(1)
}

viper.SetDefault("home", homeDir + "/.cyberdcli")
viper.SetDefault("home", homeDir+"/.cyberdcli")

if err := cyberdclaim.Execute(); err != nil {
fmt.Println(err)
Expand All @@ -41,4 +41,3 @@ func getHomeDir() (string, error) {
}
return home, nil
}

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cosmos/poc/cyberd/rpc/routes.go → cyberd/rpc/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func SetCyberdApp(cApp *app.CyberdApp) {
}

var Routes = map[string]*rpcserver.RPCFunc{
"search": rpcserver.NewRPCFunc(Search, "cid,page,perPage"),
"search": rpcserver.NewRPCFunc(Search, "cid,page,perPage"),
"account": rpcserver.NewRPCFunc(Account, "address"),
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 10 additions & 10 deletions cosmos/poc/proxy/core/request.go → proxy/core/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ type LinkRequest struct {
Memo string `json:"memo"`
}

func (r LinkRequest) GetFee() auth.StdFee { return r.Fee }
func (r LinkRequest) GetFee() auth.StdFee { return r.Fee }
func (r LinkRequest) GetSignatures() []Signature { return r.Signatures }
func (r LinkRequest) GetMemo() string { return r.Memo }
func (r LinkRequest) GetMemo() string { return r.Memo }
func (r LinkRequest) GetMsgs() []types.Msg {
msgs := make([]types.Msg, 0, len(r.Msgs))
for _, msg := range r.Msgs {
msgs = append(msgs, msg)
}
return msgs
return msgs
}

func UnmarshalLinkRequest(reqBytes []byte) (TxRequest, error) {
Expand All @@ -45,21 +45,21 @@ func UnmarshalLinkRequest(reqBytes []byte) (TxRequest, error) {
}

type SendRequest struct {
Fee auth.StdFee `json:"fee"`
Fee auth.StdFee `json:"fee"`
Msgs []bank.MsgSend `json:"msgs"`
Signatures []Signature `json:"signatures"`
Memo string `json:"memo"`
Signatures []Signature `json:"signatures"`
Memo string `json:"memo"`
}

func (r SendRequest) GetFee() auth.StdFee { return r.Fee }
func (r SendRequest) GetFee() auth.StdFee { return r.Fee }
func (r SendRequest) GetSignatures() []Signature { return r.Signatures }
func (r SendRequest) GetMemo() string { return r.Memo }
func (r SendRequest) GetMemo() string { return r.Memo }
func (r SendRequest) GetMsgs() []types.Msg {
msgs := make([]types.Msg, 0, len(r.Msgs))
for _, msg := range r.Msgs {
msgs = append(msgs, msg)
}
return msgs
return msgs
}

func UnmarshalSendRequest(reqBytes []byte) (TxRequest, error) {
Expand All @@ -69,4 +69,4 @@ func UnmarshalSendRequest(reqBytes []byte) (TxRequest, error) {
return nil, err
}
return req, nil
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.