Skip to content

Commit

Permalink
change project dir and add circleci draft
Browse files Browse the repository at this point in the history
  • Loading branch information
danil-lashin committed Jun 13, 2018
1 parent 07acc4a commit 7c643b7
Show file tree
Hide file tree
Showing 40 changed files with 102 additions and 94 deletions.
8 changes: 8 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2

defaults: &defaults
working_directory: /go/src/github.com/MinterTeam/minter-go-node
docker:
- image: circleci/golang:1.10.0
environment:
GOBIN: /tmp/workspace/bin
4 changes: 2 additions & 2 deletions api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/gorilla/mux"
"github.com/rs/cors"

"github.com/MinterTeam/minter-go-node/cmd/utils"
"github.com/MinterTeam/minter-go-node/core/minter"
"github.com/tendermint/tendermint/rpc/core/types"
"github.com/tendermint/tendermint/rpc/lib/client"
"minter/cmd/utils"
"minter/core/minter"
"time"
)

Expand Down
2 changes: 1 addition & 1 deletion api/balance.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package api

import (
"encoding/json"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/gorilla/mux"
"minter/core/types"
"net/http"
)

Expand Down
2 changes: 1 addition & 1 deletion api/balance_watcher.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package api

import (
"github.com/MinterTeam/minter-go-node/core/state"
"github.com/gorilla/websocket"
"log"
"minter/core/state"
"net/http"
)

Expand Down
4 changes: 2 additions & 2 deletions api/candidate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package api
import (
"encoding/json"
"fmt"
"github.com/MinterTeam/minter-go-node/core/state"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/gorilla/mux"
"minter/core/state"
"minter/core/types"
"net/http"
)

Expand Down
2 changes: 1 addition & 1 deletion api/coin_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package api

import (
"encoding/json"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/gorilla/mux"
"minter/core/types"
"net/http"
)

Expand Down
4 changes: 2 additions & 2 deletions api/estimate_coin_exchange_return.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package api

import (
"encoding/json"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/formula"
"math/big"
"minter/core/types"
"minter/formula"
"net/http"
)

Expand Down
4 changes: 2 additions & 2 deletions api/send_transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"io"
"io/ioutil"

"minter/core/code"
"github.com/MinterTeam/minter-go-node/core/code"
"net/http"
"strings"
//"github.com/tendermint/tendermint/rpc/core/types"
"github.com/MinterTeam/minter-go-node/core/types"
abci "github.com/tendermint/abci/types"
"github.com/tendermint/tmlibs/common"
"minter/core/types"
)

type SendTransactionRequest struct {
Expand Down
2 changes: 1 addition & 1 deletion api/transaction_count.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package api

import (
"encoding/json"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/gorilla/mux"
"minter/core/types"
"net/http"
)

Expand Down
2 changes: 1 addition & 1 deletion api/transactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package api

import (
"encoding/json"
"github.com/MinterTeam/minter-go-node/core/transaction"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tmlibs/common"
"math/big"
"minter/core/transaction"
"net/http"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/minter/main.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package main

import (
"github.com/MinterTeam/minter-go-node/api"
"github.com/MinterTeam/minter-go-node/core/minter"
"github.com/tendermint/abci/server"
"github.com/tendermint/tmlibs/common"
"github.com/tendermint/tmlibs/log"
"minter/api"
"minter/core/minter"
"os"
)

Expand Down
8 changes: 4 additions & 4 deletions core/check/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"bytes"
"errors"
"fmt"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/crypto"
"github.com/MinterTeam/minter-go-node/crypto/sha3"
"github.com/MinterTeam/minter-go-node/rlp"
"math/big"
"minter/core/types"
"minter/crypto"
"minter/crypto/sha3"
"minter/rlp"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion core/dao/dao.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dao

import "minter/core/types"
import "github.com/MinterTeam/minter-go-node/core/types"

var (
Address = types.HexToAddress("Mxa93163fdf10724dc4785ff5cbfb9ac0b5949409f")
Expand Down
20 changes: 10 additions & 10 deletions core/minter/minter.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ import (
"encoding/binary"
"encoding/json"
"fmt"
"github.com/MinterTeam/minter-go-node/cmd/utils"
"github.com/MinterTeam/minter-go-node/core/code"
"github.com/MinterTeam/minter-go-node/core/rewards"
"github.com/MinterTeam/minter-go-node/core/state"
"github.com/MinterTeam/minter-go-node/core/transaction"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/core/validators"
"github.com/MinterTeam/minter-go-node/genesis"
"github.com/MinterTeam/minter-go-node/helpers"
"github.com/MinterTeam/minter-go-node/mintdb"
abciTypes "github.com/tendermint/abci/types"
"math/big"
"minter/cmd/utils"
"minter/core/code"
"minter/core/rewards"
"minter/core/state"
"minter/core/transaction"
"minter/core/types"
"minter/core/validators"
"minter/genesis"
"minter/helpers"
"minter/mintdb"
)

type Blockchain struct {
Expand Down
2 changes: 1 addition & 1 deletion core/state/balance_watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package state

import (
"encoding/json"
"github.com/MinterTeam/minter-go-node/core/types"
"math/big"
"minter/core/types"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions core/state/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"fmt"
"sync"

"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/mintdb"
"github.com/MinterTeam/minter-go-node/trie"
lru "github.com/hashicorp/golang-lru"
"minter/core/types"
"minter/mintdb"
"minter/trie"
)

// Trie cache generation limit after which to evic trie nodes from memory.
Expand Down
4 changes: 2 additions & 2 deletions core/state/state_candidate.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/rlp"
"math/big"
"minter/core/types"
"minter/rlp"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions core/state/state_coin.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"io"

"fmt"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/crypto"
"github.com/MinterTeam/minter-go-node/rlp"
"math/big"
"minter/core/types"
"minter/crypto"
"minter/rlp"
)

// stateCoin represents a coin which is being modified.
Expand Down
4 changes: 2 additions & 2 deletions core/state/state_frozen_fund.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

"bytes"
"fmt"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/rlp"
"math/big"
"minter/core/types"
"minter/rlp"
)

// stateFrozenFund represents a frozen fund which is being modified.
Expand Down
6 changes: 3 additions & 3 deletions core/state/state_object.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"io"
"math/big"

"minter/core/types"
"minter/crypto"
"minter/rlp"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/crypto"
"github.com/MinterTeam/minter-go-node/rlp"
"sort"
)

Expand Down
10 changes: 5 additions & 5 deletions core/state/statedb.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"math/big"
"sync"

"minter/core/types"
"minter/crypto"
"minter/rlp"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/crypto"
"github.com/MinterTeam/minter-go-node/rlp"

"bytes"
"github.com/MinterTeam/minter-go-node/core/check"
"github.com/MinterTeam/minter-go-node/core/dao"
abci "github.com/tendermint/abci/types"
"minter/core/check"
"minter/core/dao"
"sort"
)

Expand Down
16 changes: 8 additions & 8 deletions core/transaction/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import (
"bytes"
"encoding/hex"
"fmt"
"github.com/MinterTeam/minter-go-node/core/check"
"github.com/MinterTeam/minter-go-node/core/code"
"github.com/MinterTeam/minter-go-node/core/state"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/crypto"
"github.com/MinterTeam/minter-go-node/crypto/sha3"
"github.com/MinterTeam/minter-go-node/formula"
"github.com/MinterTeam/minter-go-node/rlp"
"github.com/tendermint/tmlibs/common"
"math/big"
"minter/core/check"
"minter/core/code"
"minter/core/state"
"minter/core/types"
"minter/crypto"
"minter/crypto/sha3"
"minter/formula"
"minter/rlp"
"regexp"
)

Expand Down
12 changes: 6 additions & 6 deletions core/transaction/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/MinterTeam/minter-go-node/core/commissions"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/crypto"
"github.com/MinterTeam/minter-go-node/crypto/sha3"
"github.com/MinterTeam/minter-go-node/hexutil"
"github.com/MinterTeam/minter-go-node/rlp"
"math/big"
"minter/core/commissions"
"minter/core/types"
"minter/crypto"
"minter/crypto/sha3"
"minter/hexutil"
"minter/rlp"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions core/types/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"io"

"minter/hexutil"
"minter/rlp"
"github.com/MinterTeam/minter-go-node/hexutil"
"github.com/MinterTeam/minter-go-node/rlp"
)

//go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go
Expand Down
4 changes: 2 additions & 2 deletions core/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"reflect"

"bytes"
"minter/crypto/sha3"
"minter/hexutil"
"github.com/MinterTeam/minter-go-node/crypto/sha3"
"github.com/MinterTeam/minter-go-node/hexutil"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions crypto/crypto.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"math/big"
"os"

"minter/core/types"
"minter/crypto/sha3"
"minter/math"
"minter/rlp"
"github.com/MinterTeam/minter-go-node/core/types"
"github.com/MinterTeam/minter-go-node/crypto/sha3"
"github.com/MinterTeam/minter-go-node/math"
"github.com/MinterTeam/minter-go-node/rlp"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion crypto/ecies/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
"fmt"
"hash"

mintercrypto "minter/crypto"
mintercrypto "github.com/MinterTeam/minter-go-node/crypto"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion formula/formula.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package formula

import (
"github.com/ALTree/floatutils"
"github.com/MinterTeam/minter-go-node/core/types"
"math/big"
"minter/core/types"
"strings"
)

Expand Down
2 changes: 1 addition & 1 deletion genesis/genesis.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package genesis

import "minter/core/types"
import "github.com/MinterTeam/minter-go-node/core/types"

type AppState struct {
FirstValidatorAddress types.Address `json:"first_validator_address"`
Expand Down
2 changes: 1 addition & 1 deletion mintdb/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import (
"time"

// "github.com/ethereum/go-ethereum/log"
"github.com/MinterTeam/minter-go-node/metrics"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/errors"
"github.com/syndtr/goleveldb/leveldb/filter"
"github.com/syndtr/goleveldb/leveldb/iterator"
"github.com/syndtr/goleveldb/leveldb/opt"
"minter/metrics"

gometrics "github.com/rcrowley/go-metrics"
)
Expand Down
Loading

0 comments on commit 7c643b7

Please sign in to comment.