Browse Source

tendermint2

pull/43/merge
Ethan Buchman 10 years ago
parent
commit
60f166e823
96 changed files with 260 additions and 260 deletions
  1. +1
    -1
      account/account.go
  2. +1
    -1
      account/priv_account.go
  3. +2
    -2
      account/privkey.go
  4. +2
    -2
      account/pubkey.go
  5. +2
    -2
      account/signature.go
  6. +2
    -2
      account/signature_test.go
  7. +1
    -1
      alert/alert.go
  8. +1
    -1
      alert/email.go
  9. +1
    -1
      alert/log.go
  10. +1
    -1
      binary/log.go
  11. +1
    -1
      binary/reflect.go
  12. +1
    -1
      blockchain/log.go
  13. +2
    -2
      blockchain/pool.go
  14. +2
    -2
      blockchain/pool_test.go
  15. +5
    -5
      blockchain/reactor.go
  16. +4
    -4
      blockchain/store.go
  17. +2
    -2
      cmd/gen_account.go
  18. +6
    -6
      cmd/gen_tx.go
  19. +3
    -3
      cmd/gen_validator.go
  20. +1
    -1
      cmd/log.go
  21. +2
    -2
      cmd/main.go
  22. +1
    -1
      cmd/probe_upnp.go
  23. +1
    -1
      config/log.go
  24. +1
    -1
      consensus/log.go
  25. +5
    -5
      consensus/pol.go
  26. +4
    -4
      consensus/pol_test.go
  27. +7
    -7
      consensus/reactor.go
  28. +9
    -9
      consensus/state.go
  29. +1
    -1
      consensus/state_test.go
  30. +4
    -4
      consensus/test.go
  31. +3
    -3
      consensus/types/proposal.go
  32. +5
    -5
      consensus/vote_set.go
  33. +4
    -4
      consensus/vote_set_test.go
  34. +10
    -10
      daemon/daemon.go
  35. +1
    -1
      daemon/log.go
  36. +2
    -2
      db/db.go
  37. +2
    -2
      logger/log.go
  38. +1
    -1
      mempool/log.go
  39. +3
    -3
      mempool/mempool.go
  40. +3
    -3
      mempool/reactor.go
  41. +1
    -1
      merkle/iavl_node.go
  42. +3
    -3
      merkle/iavl_test.go
  43. +3
    -3
      merkle/iavl_tree.go
  44. +1
    -1
      merkle/simple_tree.go
  45. +1
    -1
      merkle/simple_tree_test.go
  46. +1
    -1
      p2p/addrbook.go
  47. +2
    -2
      p2p/connection.go
  48. +2
    -2
      p2p/listener.go
  49. +1
    -1
      p2p/log.go
  50. +2
    -2
      p2p/peer.go
  51. +1
    -1
      p2p/peer_set_test.go
  52. +2
    -2
      p2p/pex_reactor.go
  53. +1
    -1
      p2p/switch.go
  54. +2
    -2
      p2p/switch_test.go
  55. +1
    -1
      p2p/upnp/log.go
  56. +1
    -1
      p2p/upnp/probe.go
  57. +1
    -1
      rpc/core/accounts.go
  58. +2
    -2
      rpc/core/blocks.go
  59. +3
    -3
      rpc/core/mempool.go
  60. +4
    -4
      rpc/core/net.go
  61. +4
    -4
      rpc/core/pipe.go
  62. +3
    -3
      rpc/core/responses.go
  63. +2
    -2
      rpc/core/txs.go
  64. +1
    -1
      rpc/core/validators.go
  65. +2
    -2
      rpc/handlers.go
  66. +1
    -1
      rpc/http_params.go
  67. +4
    -4
      rpc/http_server.go
  68. +5
    -5
      rpc/test/http_rpc_test.go
  69. +6
    -6
      rpc/test/json_rpc_test.go
  70. +9
    -9
      rpc/test/test.go
  71. +5
    -5
      state/block_cache.go
  72. +3
    -3
      state/common.go
  73. +4
    -4
      state/execution.go
  74. +6
    -6
      state/genesis.go
  75. +1
    -1
      state/log.go
  76. +6
    -6
      state/priv_validator.go
  77. +5
    -5
      state/state.go
  78. +3
    -3
      state/state_test.go
  79. +4
    -4
      state/test.go
  80. +4
    -4
      state/tx_cache.go
  81. +3
    -3
      state/validator.go
  82. +4
    -4
      state/validator_set.go
  83. +2
    -2
      state/validator_set_test.go
  84. +5
    -5
      types/block.go
  85. +1
    -1
      types/log.go
  86. +2
    -2
      types/part_set.go
  87. +1
    -1
      types/part_set_test.go
  88. +3
    -3
      types/tx.go
  89. +3
    -3
      types/vote.go
  90. +1
    -1
      vm/log.go
  91. +3
    -3
      vm/native.go
  92. +1
    -1
      vm/stack.go
  93. +3
    -3
      vm/test/fake_app_state.go
  94. +2
    -2
      vm/test/vm_test.go
  95. +1
    -1
      vm/types.go
  96. +2
    -2
      vm/vm.go

+ 1
- 1
account/account.go View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint2/binary"
) )
// Signable is an interface for all signable things. // Signable is an interface for all signable things.


+ 1
- 1
account/priv_account.go View File

@ -2,7 +2,7 @@ package account
import ( import (
"github.com/tendermint/ed25519" "github.com/tendermint/ed25519"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
type PrivAccount struct { type PrivAccount struct {


+ 2
- 2
account/privkey.go View File

@ -2,8 +2,8 @@ package account
import ( import (
"github.com/tendermint/ed25519" "github.com/tendermint/ed25519"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
// PrivKey is part of PrivAccount and state.PrivValidator. // PrivKey is part of PrivAccount and state.PrivValidator.


+ 2
- 2
account/pubkey.go View File

@ -4,8 +4,8 @@ import (
"errors" "errors"
"github.com/tendermint/ed25519" "github.com/tendermint/ed25519"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
// PubKey is part of Account and Validator. // PubKey is part of Account and Validator.


+ 2
- 2
account/signature.go View File

@ -3,8 +3,8 @@ package account
import ( import (
"fmt" "fmt"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
// Signature is a part of Txs and consensus Votes. // Signature is a part of Txs and consensus Votes.


+ 2
- 2
account/signature_test.go View File

@ -5,8 +5,8 @@ import (
"testing" "testing"
"github.com/tendermint/ed25519" "github.com/tendermint/ed25519"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
func TestSignAndValidate(t *testing.T) { func TestSignAndValidate(t *testing.T) {


+ 1
- 1
alert/alert.go View File

@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/sfreiberg/gotwilio" "github.com/sfreiberg/gotwilio"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint2/config"
) )
var lastAlertUnix int64 = 0 var lastAlertUnix int64 = 0


+ 1
- 1
alert/email.go View File

@ -13,7 +13,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint2/config"
) )
// Convenience function // Convenience function


+ 1
- 1
alert/log.go View File

@ -1,7 +1,7 @@
package alert package alert
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "alert") var log = logger.New("module", "alert")

+ 1
- 1
binary/log.go View File

@ -2,7 +2,7 @@ package binary
import ( import (
"github.com/tendermint/log15" "github.com/tendermint/log15"
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "binary") var log = logger.New("module", "binary")


+ 1
- 1
binary/reflect.go View File

@ -9,7 +9,7 @@ import (
"sync" "sync"
"time" "time"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
type TypeInfo struct { type TypeInfo struct {


+ 1
- 1
blockchain/log.go View File

@ -1,7 +1,7 @@
package blockchain package blockchain
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "blockchain") var log = logger.New("module", "blockchain")

+ 2
- 2
blockchain/pool.go View File

@ -5,8 +5,8 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/types"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/types"
) )
const ( const (


+ 2
- 2
blockchain/pool_test.go View File

@ -5,8 +5,8 @@ import (
"testing" "testing"
"time" "time"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/types"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/types"
) )
type testPeer struct { type testPeer struct {


+ 5
- 5
blockchain/reactor.go View File

@ -7,11 +7,11 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/p2p"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/p2p"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
const ( const (


+ 4
- 4
blockchain/store.go View File

@ -6,10 +6,10 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
dbm "github.com/tendermint/tendermint/db"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
dbm "github.com/tendermint/tendermint2/db"
"github.com/tendermint/tendermint2/types"
) )
/* /*


+ 2
- 2
cmd/gen_account.go View File

@ -3,8 +3,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
) )
func gen_account() { func gen_account() {


+ 6
- 6
cmd/gen_tx.go View File

@ -8,12 +8,12 @@ import (
"os" "os"
"strconv" "strconv"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
dbm "github.com/tendermint/tendermint/db"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
dbm "github.com/tendermint/tendermint2/db"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
func getString(prompt string) string { func getString(prompt string) string {


+ 3
- 3
cmd/gen_validator.go View File

@ -3,9 +3,9 @@ package main
import ( import (
"fmt" "fmt"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint/config"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint2/binary"
"github.com/tendermint/tendermint2/config"
sm "github.com/tendermint/tendermint2/state"
) )
func gen_validator() { func gen_validator() {


+ 1
- 1
cmd/log.go View File

@ -1,7 +1,7 @@
package main package main
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "main") var log = logger.New("module", "main")

+ 2
- 2
cmd/main.go View File

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/daemon"
"github.com/tendermint/tendermint2/config"
"github.com/tendermint/tendermint2/daemon"
) )
func main() { func main() {


+ 1
- 1
cmd/probe_upnp.go View File

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/tendermint/tendermint/p2p/upnp"
"github.com/tendermint/tendermint2/p2p/upnp"
) )
func probe_upnp() { func probe_upnp() {


+ 1
- 1
config/log.go View File

@ -1,7 +1,7 @@
package config package config
import ( import (
// We can't use github.com/tendermint/tendermint/logger
// We can't use github.com/tendermint/tendermint2/logger
// because that would create a dependency cycle. // because that would create a dependency cycle.
"github.com/tendermint/log15" "github.com/tendermint/log15"
) )


+ 1
- 1
consensus/log.go View File

@ -1,7 +1,7 @@
package consensus package consensus
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "consensus") var log = logger.New("module", "consensus")

+ 5
- 5
consensus/pol.go View File

@ -3,11 +3,11 @@ package consensus
import ( import (
"fmt" "fmt"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
// Each signature of a POL (proof-of-lock, see whitepaper) is // Each signature of a POL (proof-of-lock, see whitepaper) is


+ 4
- 4
consensus/pol_test.go View File

@ -1,10 +1,10 @@
package consensus package consensus
import ( import (
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
"bytes" "bytes"
"testing" "testing"


+ 7
- 7
consensus/reactor.go View File

@ -8,13 +8,13 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/tendermint/tendermint/binary"
bc "github.com/tendermint/tendermint/blockchain"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint/consensus/types"
"github.com/tendermint/tendermint/p2p"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/binary"
bc "github.com/tendermint/tendermint2/blockchain"
. "github.com/tendermint/tendermint2/common"
. "github.com/tendermint/tendermint2/consensus/types"
"github.com/tendermint/tendermint2/p2p"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
const ( const (


+ 9
- 9
consensus/state.go View File

@ -60,15 +60,15 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
bc "github.com/tendermint/tendermint/blockchain"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/config"
. "github.com/tendermint/tendermint/consensus/types"
mempl "github.com/tendermint/tendermint/mempool"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
bc "github.com/tendermint/tendermint2/blockchain"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/config"
. "github.com/tendermint/tendermint2/consensus/types"
mempl "github.com/tendermint/tendermint2/mempool"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
const ( const (


+ 1
- 1
consensus/state_test.go View File

@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/types"
) )
func TestSetupRound(t *testing.T) { func TestSetupRound(t *testing.T) {


+ 4
- 4
consensus/test.go View File

@ -3,10 +3,10 @@ package consensus
import ( import (
"sort" "sort"
bc "github.com/tendermint/tendermint/blockchain"
dbm "github.com/tendermint/tendermint/db"
mempl "github.com/tendermint/tendermint/mempool"
sm "github.com/tendermint/tendermint/state"
bc "github.com/tendermint/tendermint2/blockchain"
dbm "github.com/tendermint/tendermint2/db"
mempl "github.com/tendermint/tendermint2/mempool"
sm "github.com/tendermint/tendermint2/state"
) )
func randConsensusState() (*ConsensusState, []*sm.PrivValidator) { func randConsensusState() (*ConsensusState, []*sm.PrivValidator) {


+ 3
- 3
consensus/types/proposal.go View File

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
"github.com/tendermint/tendermint2/types"
) )
var ( var (


+ 5
- 5
consensus/vote_set.go View File

@ -6,11 +6,11 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
// VoteSet helps collect signatures from validators at each height+round // VoteSet helps collect signatures from validators at each height+round


+ 4
- 4
consensus/vote_set_test.go View File

@ -3,10 +3,10 @@ package consensus
import ( import (
"bytes" "bytes"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint/common/test"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
. "github.com/tendermint/tendermint2/common"
. "github.com/tendermint/tendermint2/common/test"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
"testing" "testing"
) )


+ 10
- 10
daemon/daemon.go View File

@ -4,16 +4,16 @@ import (
"os" "os"
"os/signal" "os/signal"
bc "github.com/tendermint/tendermint/blockchain"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/consensus"
dbm "github.com/tendermint/tendermint/db"
mempl "github.com/tendermint/tendermint/mempool"
"github.com/tendermint/tendermint/p2p"
"github.com/tendermint/tendermint/rpc"
"github.com/tendermint/tendermint/rpc/core"
sm "github.com/tendermint/tendermint/state"
bc "github.com/tendermint/tendermint2/blockchain"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/config"
"github.com/tendermint/tendermint2/consensus"
dbm "github.com/tendermint/tendermint2/db"
mempl "github.com/tendermint/tendermint2/mempool"
"github.com/tendermint/tendermint2/p2p"
"github.com/tendermint/tendermint2/rpc"
"github.com/tendermint/tendermint2/rpc/core"
sm "github.com/tendermint/tendermint2/state"
) )
type Node struct { type Node struct {


+ 1
- 1
daemon/log.go View File

@ -1,7 +1,7 @@
package daemon package daemon
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "daemon") var log = logger.New("module", "daemon")

+ 2
- 2
db/db.go View File

@ -3,8 +3,8 @@ package db
import ( import (
"path" "path"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/config"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/config"
) )
type DB interface { type DB interface {


+ 2
- 2
logger/log.go View File

@ -5,8 +5,8 @@ import (
"os" "os"
"github.com/tendermint/log15" "github.com/tendermint/log15"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/config"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/config"
) )
var rootHandler log15.Handler var rootHandler log15.Handler


+ 1
- 1
mempool/log.go View File

@ -1,7 +1,7 @@
package mempool package mempool
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "mempool") var log = logger.New("module", "mempool")

+ 3
- 3
mempool/mempool.go View File

@ -11,9 +11,9 @@ package mempool
import ( import (
"sync" "sync"
"github.com/tendermint/tendermint/binary"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/binary"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
type Mempool struct { type Mempool struct {


+ 3
- 3
mempool/reactor.go View File

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"sync/atomic" "sync/atomic"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint/p2p"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/binary"
"github.com/tendermint/tendermint2/p2p"
"github.com/tendermint/tendermint2/types"
) )
var ( var (


+ 1
- 1
merkle/iavl_node.go View File

@ -4,7 +4,7 @@ import (
"crypto/sha256" "crypto/sha256"
"io" "io"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint2/binary"
) )
// Node // Node


+ 3
- 3
merkle/iavl_test.go View File

@ -4,9 +4,9 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/db"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/db"
"runtime" "runtime"
"testing" "testing"


+ 3
- 3
merkle/iavl_tree.go View File

@ -5,9 +5,9 @@ import (
"container/list" "container/list"
"sync" "sync"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
dbm "github.com/tendermint/tendermint/db"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
dbm "github.com/tendermint/tendermint2/db"
) )
/* /*


+ 1
- 1
merkle/simple_tree.go View File

@ -28,7 +28,7 @@ import (
"bytes" "bytes"
"crypto/sha256" "crypto/sha256"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint2/binary"
) )
func HashFromTwoHashes(left []byte, right []byte) []byte { func HashFromTwoHashes(left []byte, right []byte) []byte {


+ 1
- 1
merkle/simple_tree_test.go View File

@ -1,7 +1,7 @@
package merkle package merkle
import ( import (
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
"bytes" "bytes"
"testing" "testing"


+ 1
- 1
p2p/addrbook.go View File

@ -15,7 +15,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
const ( const (


+ 2
- 2
p2p/connection.go View File

@ -12,8 +12,8 @@ import (
flow "code.google.com/p/mxk/go1/flowcontrol" flow "code.google.com/p/mxk/go1/flowcontrol"
"github.com/tendermint/log15" "github.com/tendermint/log15"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
const ( const (


+ 2
- 2
p2p/listener.go View File

@ -6,8 +6,8 @@ import (
"strconv" "strconv"
"sync/atomic" "sync/atomic"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/p2p/upnp"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/p2p/upnp"
) )
type Listener interface { type Listener interface {


+ 1
- 1
p2p/log.go View File

@ -1,7 +1,7 @@
package p2p package p2p
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "p2p") var log = logger.New("module", "p2p")

+ 2
- 2
p2p/peer.go View File

@ -6,8 +6,8 @@ import (
"net" "net"
"sync/atomic" "sync/atomic"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
type Peer struct { type Peer struct {


+ 1
- 1
p2p/peer_set_test.go View File

@ -4,7 +4,7 @@ import (
"math/rand" "math/rand"
"testing" "testing"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
// Returns an empty dummy peer // Returns an empty dummy peer


+ 2
- 2
p2p/pex_reactor.go View File

@ -7,8 +7,8 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
var pexErrInvalidMessage = errors.New("Invalid PEX message") var pexErrInvalidMessage = errors.New("Invalid PEX message")


+ 1
- 1
p2p/switch.go View File

@ -6,7 +6,7 @@ import (
"net" "net"
"time" "time"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
type Reactor interface { type Reactor interface {


+ 2
- 2
p2p/switch_test.go View File

@ -6,8 +6,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
type PeerMessage struct { type PeerMessage struct {


+ 1
- 1
p2p/upnp/log.go View File

@ -1,7 +1,7 @@
package upnp package upnp
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "upnp") var log = logger.New("module", "upnp")

+ 1
- 1
p2p/upnp/probe.go View File

@ -6,7 +6,7 @@ import (
"net" "net"
"time" "time"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
type UPNPCapabilities struct { type UPNPCapabilities struct {


+ 1
- 1
rpc/core/accounts.go View File

@ -1,7 +1,7 @@
package core package core
import ( import (
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint2/account"
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------


+ 2
- 2
rpc/core/blocks.go View File

@ -2,8 +2,8 @@ package core
import ( import (
"fmt" "fmt"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/types"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/types"
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------


+ 3
- 3
rpc/core/mempool.go View File

@ -2,9 +2,9 @@ package core
import ( import (
"fmt" "fmt"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------


+ 4
- 4
rpc/core/net.go View File

@ -1,10 +1,10 @@
package core package core
import ( import (
"github.com/tendermint/tendermint/config"
dbm "github.com/tendermint/tendermint/db"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/config"
dbm "github.com/tendermint/tendermint2/db"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------


+ 4
- 4
rpc/core/pipe.go View File

@ -1,10 +1,10 @@
package core package core
import ( import (
bc "github.com/tendermint/tendermint/blockchain"
"github.com/tendermint/tendermint/consensus"
mempl "github.com/tendermint/tendermint/mempool"
"github.com/tendermint/tendermint/p2p"
bc "github.com/tendermint/tendermint2/blockchain"
"github.com/tendermint/tendermint2/consensus"
mempl "github.com/tendermint/tendermint2/mempool"
"github.com/tendermint/tendermint2/p2p"
) )
var blockStore *bc.BlockStore var blockStore *bc.BlockStore


+ 3
- 3
rpc/core/responses.go View File

@ -1,9 +1,9 @@
package core package core
import ( import (
"github.com/tendermint/tendermint/account"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
sm "github.com/tendermint/tendermint2/state"
"github.com/tendermint/tendermint2/types"
) )
type ResponseGenPrivAccount struct { type ResponseGenPrivAccount struct {


+ 2
- 2
rpc/core/txs.go View File

@ -2,8 +2,8 @@ package core
import ( import (
"fmt" "fmt"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/types"
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------


+ 1
- 1
rpc/core/validators.go View File

@ -1,7 +1,7 @@
package core package core
import ( import (
sm "github.com/tendermint/tendermint/state"
sm "github.com/tendermint/tendermint2/state"
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------


+ 2
- 2
rpc/handlers.go View File

@ -7,8 +7,8 @@ TODO: support Call && GetStorage.
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint/rpc/core"
"github.com/tendermint/tendermint2/binary"
"github.com/tendermint/tendermint2/rpc/core"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"reflect" "reflect"


+ 1
- 1
rpc/http_params.go View File

@ -6,7 +6,7 @@ import (
"regexp" "regexp"
"strconv" "strconv"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
var ( var (


+ 4
- 4
rpc/http_server.go View File

@ -8,10 +8,10 @@ import (
"runtime/debug" "runtime/debug"
"time" "time"
"github.com/tendermint/tendermint/alert"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint2/alert"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/config"
) )
func StartHTTPServer() { func StartHTTPServer() {


+ 5
- 5
rpc/test/http_rpc_test.go View File

@ -5,11 +5,11 @@ import (
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/merkle"
"github.com/tendermint/tendermint/rpc/core"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/binary"
"github.com/tendermint/tendermint2/config"
"github.com/tendermint/tendermint2/merkle"
"github.com/tendermint/tendermint2/rpc/core"
"github.com/tendermint/tendermint2/types"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url" "net/url"


+ 6
- 6
rpc/test/json_rpc_test.go View File

@ -5,12 +5,12 @@ import (
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/rpc"
"github.com/tendermint/tendermint/rpc/core"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/config"
"github.com/tendermint/tendermint2/rpc"
"github.com/tendermint/tendermint2/rpc/core"
"github.com/tendermint/tendermint2/types"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url" "net/url"


+ 9
- 9
rpc/test/test.go View File

@ -4,15 +4,15 @@ import (
"bytes" "bytes"
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/daemon"
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint/p2p"
"github.com/tendermint/tendermint/rpc"
"github.com/tendermint/tendermint/rpc/core"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
"github.com/tendermint/tendermint2/config"
"github.com/tendermint/tendermint2/daemon"
"github.com/tendermint/tendermint2/logger"
"github.com/tendermint/tendermint2/p2p"
"github.com/tendermint/tendermint2/rpc"
"github.com/tendermint/tendermint2/rpc/core"
"github.com/tendermint/tendermint2/types"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url" "net/url"


+ 5
- 5
state/block_cache.go View File

@ -4,11 +4,11 @@ import (
"bytes" "bytes"
"sort" "sort"
ac "github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
dbm "github.com/tendermint/tendermint/db"
"github.com/tendermint/tendermint/merkle"
ac "github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
dbm "github.com/tendermint/tendermint2/db"
"github.com/tendermint/tendermint2/merkle"
) )
func makeStorage(db dbm.DB, root []byte) merkle.Tree { func makeStorage(db dbm.DB, root []byte) merkle.Tree {


+ 3
- 3
state/common.go View File

@ -1,9 +1,9 @@
package state package state
import ( import (
ac "github.com/tendermint/tendermint/account"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/vm"
ac "github.com/tendermint/tendermint2/account"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/vm"
) )
type AccountGetter interface { type AccountGetter interface {


+ 4
- 4
state/execution.go View File

@ -4,10 +4,10 @@ import (
"bytes" "bytes"
"errors" "errors"
"github.com/tendermint/tendermint/account"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint/vm"
"github.com/tendermint/tendermint2/account"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/types"
"github.com/tendermint/tendermint2/vm"
) )
// NOTE: If an error occurs during block execution, state will be left // NOTE: If an error occurs during block execution, state will be left


+ 6
- 6
state/genesis.go View File

@ -4,12 +4,12 @@ import (
"io/ioutil" "io/ioutil"
"time" "time"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
dbm "github.com/tendermint/tendermint/db"
"github.com/tendermint/tendermint/merkle"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
dbm "github.com/tendermint/tendermint2/db"
"github.com/tendermint/tendermint2/merkle"
"github.com/tendermint/tendermint2/types"
) )
type GenesisAccount struct { type GenesisAccount struct {


+ 1
- 1
state/log.go View File

@ -1,7 +1,7 @@
package state package state
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "state") var log = logger.New("module", "state")

+ 6
- 6
state/priv_validator.go View File

@ -9,12 +9,12 @@ import (
"math" "math"
"sync" "sync"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/config"
. "github.com/tendermint/tendermint/consensus/types"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/config"
. "github.com/tendermint/tendermint2/consensus/types"
"github.com/tendermint/tendermint2/types"
"github.com/tendermint/ed25519" "github.com/tendermint/ed25519"
) )


+ 5
- 5
state/state.go View File

@ -5,11 +5,11 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
dbm "github.com/tendermint/tendermint/db"
"github.com/tendermint/tendermint/merkle"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
dbm "github.com/tendermint/tendermint2/db"
"github.com/tendermint/tendermint2/merkle"
"github.com/tendermint/tendermint2/types"
) )
var ( var (


+ 3
- 3
state/state_test.go View File

@ -1,9 +1,9 @@
package state package state
import ( import (
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/config"
"github.com/tendermint/tendermint2/types"
"bytes" "bytes"
"testing" "testing"


+ 4
- 4
state/test.go View File

@ -4,10 +4,10 @@ import (
"bytes" "bytes"
"sort" "sort"
"github.com/tendermint/tendermint/account"
. "github.com/tendermint/tendermint/common"
dbm "github.com/tendermint/tendermint/db"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
. "github.com/tendermint/tendermint2/common"
dbm "github.com/tendermint/tendermint2/db"
"github.com/tendermint/tendermint2/types"
"io/ioutil" "io/ioutil"
"os" "os"


+ 4
- 4
state/tx_cache.go View File

@ -1,10 +1,10 @@
package state package state
import ( import (
ac "github.com/tendermint/tendermint/account"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/vm"
"github.com/tendermint/tendermint/vm/sha3"
ac "github.com/tendermint/tendermint2/account"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/vm"
"github.com/tendermint/tendermint2/vm/sha3"
) )
type TxCache struct { type TxCache struct {


+ 3
- 3
state/validator.go View File

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
"github.com/tendermint/tendermint2/types"
) )
// Persistent (mostly) static data for each Validator // Persistent (mostly) static data for each Validator


+ 4
- 4
state/validator_set.go View File

@ -7,10 +7,10 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/tendermint/tendermint/account"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/merkle"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint2/account"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/merkle"
"github.com/tendermint/tendermint2/types"
) )
// ValidatorSet represent a set of *Validator at a given height. // ValidatorSet represent a set of *Validator at a given height.


+ 2
- 2
state/validator_set_test.go View File

@ -1,8 +1,8 @@
package state package state
import ( import (
"github.com/tendermint/tendermint/account"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/account"
. "github.com/tendermint/tendermint2/common"
"bytes" "bytes"
"testing" "testing"


+ 5
- 5
types/block.go View File

@ -8,11 +8,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/merkle"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/config"
"github.com/tendermint/tendermint2/merkle"
) )
type Block struct { type Block struct {


+ 1
- 1
types/log.go View File

@ -1,7 +1,7 @@
package types package types
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "types") var log = logger.New("module", "types")

+ 2
- 2
types/part_set.go View File

@ -9,8 +9,8 @@ import (
"strings" "strings"
"sync" "sync"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/merkle"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/merkle"
) )
const ( const (


+ 1
- 1
types/part_set_test.go View File

@ -5,7 +5,7 @@ import (
"io/ioutil" "io/ioutil"
"testing" "testing"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
func TestBasicPartSet(t *testing.T) { func TestBasicPartSet(t *testing.T) {


+ 3
- 3
types/tx.go View File

@ -4,9 +4,9 @@ import (
"errors" "errors"
"io" "io"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
var ( var (


+ 3
- 3
types/vote.go View File

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/tendermint/tendermint/account"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint2/account"
"github.com/tendermint/tendermint2/binary"
. "github.com/tendermint/tendermint2/common"
) )
var ( var (


+ 1
- 1
vm/log.go View File

@ -1,7 +1,7 @@
package vm package vm
import ( import (
"github.com/tendermint/tendermint/logger"
"github.com/tendermint/tendermint2/logger"
) )
var log = logger.New("module", "vm") var log = logger.New("module", "vm")

+ 3
- 3
vm/native.go View File

@ -3,9 +3,9 @@ package vm
import ( import (
"code.google.com/p/go.crypto/ripemd160" "code.google.com/p/go.crypto/ripemd160"
"crypto/sha256" "crypto/sha256"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/vm/secp256k1"
"github.com/tendermint/tendermint/vm/sha3"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/vm/secp256k1"
"github.com/tendermint/tendermint2/vm/sha3"
) )
var nativeContracts = make(map[Word256]NativeContract) var nativeContracts = make(map[Word256]NativeContract)


+ 1
- 1
vm/stack.go View File

@ -2,7 +2,7 @@ package vm
import ( import (
"fmt" "fmt"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
// Not goroutine safe // Not goroutine safe


+ 3
- 3
vm/test/fake_app_state.go View File

@ -1,9 +1,9 @@
package vm package vm
import ( import (
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint/vm"
"github.com/tendermint/tendermint/vm/sha3"
. "github.com/tendermint/tendermint2/common"
. "github.com/tendermint/tendermint2/vm"
"github.com/tendermint/tendermint2/vm/sha3"
) )
type FakeAppState struct { type FakeAppState struct {


+ 2
- 2
vm/test/vm_test.go View File

@ -8,8 +8,8 @@ import (
"testing" "testing"
"time" "time"
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint/vm"
. "github.com/tendermint/tendermint2/common"
. "github.com/tendermint/tendermint2/vm"
) )
func newAppState() *FakeAppState { func newAppState() *FakeAppState {


+ 1
- 1
vm/types.go View File

@ -1,7 +1,7 @@
package vm package vm
import ( import (
. "github.com/tendermint/tendermint/common"
. "github.com/tendermint/tendermint2/common"
) )
const ( const (


+ 2
- 2
vm/vm.go View File

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"math/big" "math/big"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/vm/sha3"
. "github.com/tendermint/tendermint2/common"
"github.com/tendermint/tendermint2/vm/sha3"
) )
var ( var (


Loading…
Cancel
Save