Clean up folders

cybercongress · Dec 13, 2018 · 82d1d36 · 82d1d36
1 parent 48b9607
commit 82d1d36
Show file tree

Hide file tree

Showing 23 changed files with 7 additions and 381 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,10 +31,9 @@ jobs:
           name: Build And Test Project
           command: |
             export GO111MODULE=on
-            go build -o daemon ./cyberd
+            go build -o cyberd ./daemon
             go build -o cyberdcli ./cli
             go build -o cyberdproxy ./proxy
-            go build -o cyberdclaim ./claim
 
 
   update_changelog:

diff --git a/Dockerfile b/Dockerfile
@@ -33,7 +33,7 @@ RUN nvcc -fmad=false -shared -o libcbdrank.so rank.cu --compiler-options '-fPIC
 # Compile cyberd
 ###############################################################################
 WORKDIR /sources
-RUN go build -tags cuda -o daemon ./cyberd
+RUN go build -tags cuda -o cyberd ./daemon
 RUN go build -o cyberdcli ./cli
 RUN go build -o cyberdproxy ./proxy
 
@@ -64,7 +64,7 @@ RUN url="https://golang.org/dl/go${GO_VERSION}.${GO_ARCH}.tar.gz" && \
 
 #  Copy compiled kernel and binaries
 ###############################################################################
-COPY --from=build_stage /sources/daemon /usr/bin/cyberd
+COPY --from=build_stage /sources/cyberd /usr/bin/cyberd
 COPY --from=build_stage /sources/cyberdcli /usr/bin/cyberdcli
 COPY --from=build_stage /sources/cyberdproxy /usr/bin/cyberdproxy
 

diff --git a/claim/claim.go b/claim/claim.go
diff --git a/claim/client/handler.go b/claim/client/handler.go
diff --git a/claim/client/start.go b/claim/client/start.go
diff --git a/claim/common/flags.go b/claim/common/flags.go
diff --git a/claim/common/verifier.go b/claim/common/verifier.go
diff --git a/claim/context/ctx.go b/claim/context/ctx.go
diff --git a/cli/commands/linktx.go b/cli/commands/linktx.go
@@ -7,7 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtxb "github.com/cosmos/cosmos-sdk/x/auth/client/txbuilder"
 	cbd "github.com/cybercongress/cyberd/app/types"
-	. "github.com/cybercongress/cyberd/cli/util"
+	"github.com/cybercongress/cyberd/x/link"
 	"github.com/ipfs/go-cid"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -57,7 +57,7 @@ func LinkTxCmd(cdc *codec.Codec) *cobra.Command {
 			}
 
 			// build and sign the transaction, then broadcast to Tendermint
-			msg := BuildMsg(from, cidFrom, cidTo)
+			msg := link.NewMsg(from, cidFrom, cidTo)
 
 			return utils.CompleteAndBroadcastTxCli(txCtx, cliCtx, []sdk.Msg{msg})
 		},