fix pathes after rename

rus-alex · Oct 2, 2019 · d6089ef · d6089ef
1 parent 6519055
commit d6089ef
Show file tree

Hide file tree

Showing 138 changed files with 421 additions and 420 deletions.
diff --git a/.codacy.yml b/.codacy.yml
@@ -25,5 +25,5 @@ exclude_paths:
 - 'spec/**/*'
 - 'benchmarks/**/*'
 - '*.min.js'
-- 'src/**/*.pb.go'
+- '**/*.pb.go'
 - '**/tests/**'
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -6,7 +6,7 @@ builds:
     binary: go-lachesis-dummy
     ldflags:
       - -linkmode external -extldflags -static -s -w
-      - -X github.com/Fantom-foundation/go-lachesis/src/version.GitCommit={{ .ShortCommit }}
+      - -X github.com/Fantom-foundation/go-lachesis/version.GitCommit={{ .ShortCommit }}
     env:
       - CGO_ENABLED=0
     goos:
@@ -19,7 +19,7 @@ builds:
     binary: go-lachesis-dummy-client
     ldflags:
       - -linkmode external -extldflags -static -s -w
-      - -X github.com/Fantom-foundation/go-lachesis/src/version.GitCommit={{ .ShortCommit }}
+      - -X github.com/Fantom-foundation/go-lachesis/version.GitCommit={{ .ShortCommit }}
     env:
       - CGO_ENABLED=0
     goos:
@@ -30,7 +30,7 @@ builds:
     binary: go-lachesis
     ldflags:
       - -linkmode external -extldflags -static -s -w
-      - -X github.com/Fantom-foundation/go-lachesis/src/version.GitCommit={{ .ShortCommit }}
+      - -X github.com/Fantom-foundation/go-lachesis/version.GitCommit={{ .ShortCommit }}
     env:
       - CGO_ENABLED=0
     goos:
@@ -41,7 +41,7 @@ builds:
     binary: go-lachesis-with-profiler
     ldflags:
       - -linkmode external -extldflags -static -s -w
-      - -X github.com/Fantom-foundation/go-lachesis/src/version.GitCommit={{ .ShortCommit }}
+      - -X github.com/Fantom-foundation/go-lachesis/version.GitCommit={{ .ShortCommit }}
     env:
       - CGO_ENABLED=0
     goos:
@@ -52,7 +52,7 @@ builds:
     binary: go-lachesis-network
     ldflags:
       - -linkmode external -extldflags -static -s -w
-      - -X github.com/Fantom-foundation/go-lachesis/src/version.GitCommit={{ .ShortCommit }}
+      - -X github.com/Fantom-foundation/go-lachesis/version.GitCommit={{ .ShortCommit }}
     env:
       - CGO_ENABLED=0
     goos:

diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ export CGO_ENABLED=0
 SUBDIRS := src/.
 TARGETS := build proto clean buildtests
 SUBDIR_TARGETS := $(foreach t,$(TARGETS),$(addsuffix $t,$(SUBDIRS)))
-VENDOR_LDFLAG := --ldflags "-X github.com/Fantom-foundation/go-lachesis/src/version.GitCommit=`git rev-parse HEAD`"
+VENDOR_LDFLAG := --ldflags "-X github.com/Fantom-foundation/go-lachesis/version.GitCommit=`git rev-parse HEAD`"
 
 ifeq ($(OS),Windows_NT)
     # EXTLDFLAGS := ""

diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ Building `lachesis` requires both a Go (version 1.12 or later) and a C compiler.
 them using your favourite package manager. Once the dependencies are installed, run
 
 ```shell
-go build -o ./build/lachesis ./src/cmd
+go build -o ./build/lachesis ./cmd
 ```
 The build output is ```build/lachesis``` executable.
 
@@ -89,7 +89,7 @@ One of the quickest ways to get Lachesis up and running on your machine is by us
 Docker:
 
 ```shell
-cd src/docker
+cd docker/
 make
 docker run -d --name lachesis-node -v /home/alice/lachesis:/root \
            -p 5050:5050 \
@@ -119,21 +119,21 @@ docker logs lachesis-node
 
 Lachesis has extensive unit-testing. Use the Go tool to run tests:
 ```shell
-go test ./src/...
+go test ./...
 ```
 
 If everything goes well, it should output something along these lines:
 ```
-?       github.com/Fantom-foundation/go-lachesis/src/event_check/basic_check    [no test files]
-?       github.com/Fantom-foundation/go-lachesis/src/event_check/epoch_check    [no test files]
-?       github.com/Fantom-foundation/go-lachesis/src/event_check/heavy_check    [no test files]
-?       github.com/Fantom-foundation/go-lachesis/src/event_check/parents_check  [no test files]
-ok      github.com/Fantom-foundation/go-lachesis/src/evm_core   (cached)
-ok      github.com/Fantom-foundation/go-lachesis/src/gossip (cached)
-?       github.com/Fantom-foundation/go-lachesis/src/gossip/fetcher [no test files]
-?       github.com/Fantom-foundation/go-lachesis/src/gossip/occured_txs [no test files]
-ok      github.com/Fantom-foundation/go-lachesis/src/gossip/ordering    (cached)
-ok      github.com/Fantom-foundation/go-lachesis/src/gossip/packs_downloader    (cached)
+?       github.com/Fantom-foundation/go-lachesis/event_check/basic_check    [no test files]
+?       github.com/Fantom-foundation/go-lachesis/event_check/epoch_check    [no test files]
+?       github.com/Fantom-foundation/go-lachesis/event_check/heavy_check    [no test files]
+?       github.com/Fantom-foundation/go-lachesis/event_check/parents_check  [no test files]
+ok      github.com/Fantom-foundation/go-lachesis/evm_core   (cached)
+ok      github.com/Fantom-foundation/go-lachesis/gossip (cached)
+?       github.com/Fantom-foundation/go-lachesis/gossip/fetcher [no test files]
+?       github.com/Fantom-foundation/go-lachesis/gossip/occured_txs [no test files]
+ok      github.com/Fantom-foundation/go-lachesis/gossip/ordering    (cached)
+ok      github.com/Fantom-foundation/go-lachesis/gossip/packs_downloader    (cached)
 ```
 
 ### Operating a private network
@@ -160,14 +160,14 @@ $ lachesis --fakenet 1/5 --bootnodes "enode://ade7067fe5495db3d9f44dfda710a2873f
 
 For the testing purposes, the full demo may be launched using:
 ```shell
-cd src/docker
+cd docker/
 make # build docker image
 ./start.sh # start the containers
 ./stop.sh # stop the demo
 ```
 
 The full demo doesn't spin up very fast. To avoid the full docker image building, you may run the integration test instead:
 ```shell
-go test -v ./src/integration/...
+go test -v ./integration/...
 ```
 Adjust test duration, number of nodes and logs verbosity in the test source code.
diff --git a/cmd/config.go b/cmd/config.go
@@ -19,10 +19,10 @@ import (
 	"github.com/naoina/toml"
 	"gopkg.in/urfave/cli.v1"
 
-	"github.com/Fantom-foundation/go-lachesis/src/evm_core"
-	"github.com/Fantom-foundation/go-lachesis/src/gossip"
-	"github.com/Fantom-foundation/go-lachesis/src/gossip/gasprice"
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis"
+	"github.com/Fantom-foundation/go-lachesis/evm_core"
+	"github.com/Fantom-foundation/go-lachesis/gossip"
+	"github.com/Fantom-foundation/go-lachesis/gossip/gasprice"
+	"github.com/Fantom-foundation/go-lachesis/lachesis"
 )
 
 var (

diff --git a/cmd/consolecmd_test.go b/cmd/consolecmd_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/params"
 
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis/genesis"
+	"github.com/Fantom-foundation/go-lachesis/lachesis/genesis"
 )
 
 const (

diff --git a/cmd/emitter.go b/cmd/emitter.go
@@ -5,8 +5,8 @@ import (
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	cli "gopkg.in/urfave/cli.v1"
 
-	"github.com/Fantom-foundation/go-lachesis/src/crypto"
-	"github.com/Fantom-foundation/go-lachesis/src/gossip"
+	"github.com/Fantom-foundation/go-lachesis/crypto"
+	"github.com/Fantom-foundation/go-lachesis/gossip"
 )
 
 // setCoinbase retrieves the etherbase either from the directly specified

diff --git a/cmd/fake.go b/cmd/fake.go
@@ -10,8 +10,8 @@ import (
 	"github.com/ethereum/go-ethereum/node"
 	cli "gopkg.in/urfave/cli.v1"
 
-	"github.com/Fantom-foundation/go-lachesis/src/crypto"
-	"github.com/Fantom-foundation/go-lachesis/src/integration"
+	"github.com/Fantom-foundation/go-lachesis/crypto"
+	"github.com/Fantom-foundation/go-lachesis/integration"
 )
 
 var FakeNetFlag = cli.StringFlag{

diff --git a/cmd/fake_test.go b/cmd/fake_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/params"
 
-	"github.com/Fantom-foundation/go-lachesis/src/crypto"
+	"github.com/Fantom-foundation/go-lachesis/crypto"
 )
 
 func TestFakeNetFlag(t *testing.T) {

diff --git a/cmd/main.go b/cmd/main.go
@@ -18,9 +18,9 @@ import (
 	"github.com/ethereum/go-ethereum/node"
 	"gopkg.in/urfave/cli.v1"
 
-	"github.com/Fantom-foundation/go-lachesis/src/debug"
-	"github.com/Fantom-foundation/go-lachesis/src/gossip"
-	"github.com/Fantom-foundation/go-lachesis/src/integration"
+	"github.com/Fantom-foundation/go-lachesis/debug"
+	"github.com/Fantom-foundation/go-lachesis/gossip"
+	"github.com/Fantom-foundation/go-lachesis/integration"
 )
 
 const (

diff --git a/cmd/run_test.go b/cmd/run_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/Fantom-foundation/go-lachesis/src/cmd/cmdtest"
+	"github.com/Fantom-foundation/go-lachesis/cmd/cmdtest"
 )
 
 func tmpdir(t *testing.T) string {

diff --git a/common/bytes_test.go b/common/bytes_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/Fantom-foundation/go-lachesis/src/common/bigendian"
-	"github.com/Fantom-foundation/go-lachesis/src/common/littleendian"
+	"github.com/Fantom-foundation/go-lachesis/common/bigendian"
+	"github.com/Fantom-foundation/go-lachesis/common/littleendian"
 )
 
 func Test_IntToBytes(t *testing.T) {

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -12,7 +12,7 @@ RUN export GIT_COMMIT=$(git rev-list -1 HEAD) && \
     export CGO_ENABLED=1 && \
     go build -ldflags "-s -w -X main.gitCommit=$GIT_COMMIT -X main.gitDate=$GIT_DATE" \
     -o /tmp/lachesis \
-    ./src/cmd
+    ./cmd
 
 
 

diff --git a/docker/Makefile b/docker/Makefile
@@ -3,4 +3,4 @@ all: build
 
 .PHONY: build
 build:
-	cd ../../ && docker build -f src/docker/Dockerfile -t "lachesis" .
+	cd ../ && docker build -f docker/Dockerfile -t "lachesis" .
diff --git a/ethapi/api.go b/ethapi/api.go
@@ -44,10 +44,10 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/tyler-smith/go-bip39"
 
-	"github.com/Fantom-foundation/go-lachesis/src/event_check/basic_check"
-	"github.com/Fantom-foundation/go-lachesis/src/evm_core"
-	"github.com/Fantom-foundation/go-lachesis/src/hash"
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
+	"github.com/Fantom-foundation/go-lachesis/event_check/basic_check"
+	"github.com/Fantom-foundation/go-lachesis/evm_core"
+	"github.com/Fantom-foundation/go-lachesis/hash"
+	"github.com/Fantom-foundation/go-lachesis/inter"
 )
 
 const (

diff --git a/ethapi/backend.go b/ethapi/backend.go
@@ -31,9 +31,9 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 
-	"github.com/Fantom-foundation/go-lachesis/src/evm_core"
-	"github.com/Fantom-foundation/go-lachesis/src/hash"
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
+	"github.com/Fantom-foundation/go-lachesis/evm_core"
+	"github.com/Fantom-foundation/go-lachesis/hash"
+	"github.com/Fantom-foundation/go-lachesis/inter"
 )
 
 // Backend interface provides the common API services (that are provided by

diff --git a/event_check/all.go b/event_check/all.go
@@ -1,12 +1,12 @@
 package event_check
 
 import (
-	"github.com/Fantom-foundation/go-lachesis/src/event_check/basic_check"
-	"github.com/Fantom-foundation/go-lachesis/src/event_check/epoch_check"
-	"github.com/Fantom-foundation/go-lachesis/src/event_check/heavy_check"
-	"github.com/Fantom-foundation/go-lachesis/src/event_check/parents_check"
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis"
+	"github.com/Fantom-foundation/go-lachesis/event_check/basic_check"
+	"github.com/Fantom-foundation/go-lachesis/event_check/epoch_check"
+	"github.com/Fantom-foundation/go-lachesis/event_check/heavy_check"
+	"github.com/Fantom-foundation/go-lachesis/event_check/parents_check"
+	"github.com/Fantom-foundation/go-lachesis/inter"
+	"github.com/Fantom-foundation/go-lachesis/lachesis"
 	"github.com/ethereum/go-ethereum/core/types"
 )
 

diff --git a/event_check/ban.go b/event_check/ban.go
@@ -3,7 +3,7 @@ package event_check
 import (
 	"errors"
 
-	"github.com/Fantom-foundation/go-lachesis/src/event_check/epoch_check"
+	"github.com/Fantom-foundation/go-lachesis/event_check/epoch_check"
 )
 
 var (

diff --git a/event_check/basic_check/basic_check.go b/event_check/basic_check/basic_check.go
@@ -7,9 +7,9 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
 
-	"github.com/Fantom-foundation/go-lachesis/src/evm_core"
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis"
+	"github.com/Fantom-foundation/go-lachesis/evm_core"
+	"github.com/Fantom-foundation/go-lachesis/inter"
+	"github.com/Fantom-foundation/go-lachesis/lachesis"
 )
 
 const (

diff --git a/event_check/epoch_check/epoch_check.go b/event_check/epoch_check/epoch_check.go
@@ -3,10 +3,10 @@ package epoch_check
 import (
 	"errors"
 
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
-	"github.com/Fantom-foundation/go-lachesis/src/inter/idx"
-	"github.com/Fantom-foundation/go-lachesis/src/inter/pos"
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis"
+	"github.com/Fantom-foundation/go-lachesis/inter"
+	"github.com/Fantom-foundation/go-lachesis/inter/idx"
+	"github.com/Fantom-foundation/go-lachesis/inter/pos"
+	"github.com/Fantom-foundation/go-lachesis/lachesis"
 )
 
 var (

diff --git a/event_check/heavy_check/heavy_check.go b/event_check/heavy_check/heavy_check.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/core/types"
 
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis"
+	"github.com/Fantom-foundation/go-lachesis/inter"
+	"github.com/Fantom-foundation/go-lachesis/lachesis"
 )
 
 var (

diff --git a/event_check/parents_check/parents_check.go b/event_check/parents_check/parents_check.go
@@ -3,9 +3,9 @@ package parents_check
 import (
 	"errors"
 
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
-	"github.com/Fantom-foundation/go-lachesis/src/inter/idx"
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis"
+	"github.com/Fantom-foundation/go-lachesis/inter"
+	"github.com/Fantom-foundation/go-lachesis/inter/idx"
+	"github.com/Fantom-foundation/go-lachesis/lachesis"
 )
 
 var (

diff --git a/evm_core/apply_genesis.go b/evm_core/apply_genesis.go
@@ -11,9 +11,9 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
 
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
-	"github.com/Fantom-foundation/go-lachesis/src/inter/idx"
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis"
+	"github.com/Fantom-foundation/go-lachesis/inter"
+	"github.com/Fantom-foundation/go-lachesis/inter/idx"
+	"github.com/Fantom-foundation/go-lachesis/lachesis"
 )
 
 // GenesisMismatchError is raised when trying to overwrite an existing

diff --git a/evm_core/apply_genesis_test.go b/evm_core/apply_genesis_test.go
@@ -6,11 +6,11 @@ import (
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/Fantom-foundation/go-lachesis/src/kvdb/memorydb"
-	"github.com/Fantom-foundation/go-lachesis/src/kvdb/no_key_is_err"
-	"github.com/Fantom-foundation/go-lachesis/src/kvdb/table"
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis"
-	"github.com/Fantom-foundation/go-lachesis/src/logger"
+	"github.com/Fantom-foundation/go-lachesis/kvdb/memorydb"
+	"github.com/Fantom-foundation/go-lachesis/kvdb/no_key_is_err"
+	"github.com/Fantom-foundation/go-lachesis/kvdb/table"
+	"github.com/Fantom-foundation/go-lachesis/lachesis"
+	"github.com/Fantom-foundation/go-lachesis/logger"
 )
 
 func TestApplyGenesis(t *testing.T) {

diff --git a/evm_core/bench_test.go b/evm_core/bench_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/params"
 
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis"
-	"github.com/Fantom-foundation/go-lachesis/src/lachesis/genesis"
+	"github.com/Fantom-foundation/go-lachesis/lachesis"
+	"github.com/Fantom-foundation/go-lachesis/lachesis/genesis"
 )
 
 func BenchmarkInsertChain_empty_memdb(b *testing.B) {

diff --git a/evm_core/chain_makers.go b/evm_core/chain_makers.go
@@ -11,7 +11,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/params"
 
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
+	"github.com/Fantom-foundation/go-lachesis/inter"
 )
 
 // BlockGen creates blocks for testing.

diff --git a/evm_core/dummy_block.go b/evm_core/dummy_block.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 
-	"github.com/Fantom-foundation/go-lachesis/src/inter"
+	"github.com/Fantom-foundation/go-lachesis/inter"
 )
 
 type (
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ import ( @@
     	"github.com/ethereum/go-ethereum/params"
-    	"github.com/Fantom-foundation/go-lachesis/src/lachesis/genesis"
+    	"github.com/Fantom-foundation/go-lachesis/lachesis/genesis"
     )
     const (
@@ Expand Down @@