From 2a602db9b0d012ddd686af097fd0cbc1a5056707 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Thu, 15 Nov 2018 12:07:29 +0000 Subject: [PATCH] fix the build after rename the repo to harmony-one [TEST] $ ./go_executable_build.sh Harmony (C) 2018. benchmark, version v1174-23ace87 (ec2-user@ 2018-11-15T12:07:48+0000) Harmony (C) 2018. txgen, version v1174-23ace87 (ec2-user@ 2018-11-15T12:07:48+0000) Signed-off-by: Leo Chen --- README.md | 4 ++-- attack/attack.go | 2 +- beaconchain/beaconchain.go | 10 +++++----- beaconchain/beaconchain_handler.go | 6 +++--- benchmark.go | 14 +++++++------- blockchain/block.go | 4 ++-- blockchain/blockchain.go | 2 +- blockchain/blockchain_test.go | 2 +- blockchain/transaction.go | 2 +- blockchain/utxopool.go | 4 ++-- client/client.go | 10 +++++----- client/config/config.go | 2 +- client/txgen/main.go | 18 +++++++++--------- client/utils.go | 2 +- client/wallet/main.go | 18 +++++++++--------- consensus/consensus.go | 12 ++++++------ consensus/consensus_engine.go | 2 +- consensus/consensus_leader.go | 12 ++++++------ consensus/consensus_leader_msg.go | 6 +++--- consensus/consensus_leader_msg_test.go | 8 ++++---- consensus/consensus_test.go | 2 +- consensus/consensus_validator.go | 14 +++++++------- consensus/consensus_validator_msg.go | 4 ++-- consensus/consensus_validator_msg_test.go | 6 +++--- core/block_validator.go | 4 ++-- core/blockchain.go | 6 +++--- core/events.go | 2 +- core/evm.go | 4 ++-- core/headerchain.go | 6 +++--- core/rawdb/accessors_chain.go | 2 +- core/rawdb/accessors_chain_test.go | 2 +- core/rawdb/accessors_indexes.go | 2 +- core/rawdb/accessors_indexes_test.go | 2 +- core/state_processor.go | 4 ++-- core/tx_journal.go | 2 +- core/tx_list.go | 2 +- core/tx_list_test.go | 2 +- core/tx_pool.go | 2 +- core/tx_pool_test.go | 2 +- core/types.go | 2 +- crypto/pki/utils.go | 4 ++-- db/db.go | 2 +- db/memory_db.go | 2 +- harmony/main.go | 4 ++-- node/node.go | 18 +++++++++--------- node/node_handler.go | 14 +++++++------- node/node_test.go | 4 ++-- node/node_utils.go | 4 ++-- p2p/helper_test.go | 2 +- p2p/ida/ida.go | 2 +- p2p/ida/ida_test.go | 2 +- p2p/ida/interface.go | 2 +- p2p/peer.go | 2 +- profiler/profiler.go | 2 +- proto/client/client.go | 4 ++-- proto/consensus/consensus.go | 2 +- proto/identity/identity.go | 2 +- proto/node/node.go | 6 +++--- runid/run-identity.go | 2 +- runnode/run-node.go | 4 ++-- syncing/syncing.go | 6 +++--- utils/distribution_config.go | 6 +++--- utils/utils.go | 2 +- 63 files changed, 155 insertions(+), 155 deletions(-) diff --git a/README.md b/README.md index 2acc4e610..c4e17ece2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Harmony Benchmark -[![Build Status](https://travis-ci.com/simple-rules/harmony-benchmark.svg?token=DnoYvYiTAk7pqTo9XsTi&branch=master)](https://travis-ci.com/simple-rules/harmony-benchmark) +[![Build Status](https://travis-ci.com/harmony-one/harmony.svg?token=DnoYvYiTAk7pqTo9XsTi&branch=master)](https://travis-ci.com/harmony-one/harmony) ## Coding Guidelines @@ -18,7 +18,7 @@ mkdir -p $HOME//src cd $HOME//src -git clone git@github.com:simple-rules/harmony-benchmark.git +git clone git@github.com:harmony-one/harmony.git cd harmony-benchmark diff --git a/attack/attack.go b/attack/attack.go index d0f609d8e..2ce8c3e70 100644 --- a/attack/attack.go +++ b/attack/attack.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/simple-rules/harmony-benchmark/log" + "github.com/harmony-one/harmony/log" ) // Constants used for attack model. diff --git a/beaconchain/beaconchain.go b/beaconchain/beaconchain.go index 98a2e2d9f..b3e70363d 100644 --- a/beaconchain/beaconchain.go +++ b/beaconchain/beaconchain.go @@ -7,11 +7,11 @@ import ( "sync" "github.com/dedis/kyber" - "github.com/simple-rules/harmony-benchmark/crypto/pki" - "github.com/simple-rules/harmony-benchmark/log" - "github.com/simple-rules/harmony-benchmark/node" - "github.com/simple-rules/harmony-benchmark/p2p" - proto_identity "github.com/simple-rules/harmony-benchmark/proto/identity" + "github.com/harmony-one/harmony/crypto/pki" + "github.com/harmony-one/harmony/log" + "github.com/harmony-one/harmony/node" + "github.com/harmony-one/harmony/p2p" + proto_identity "github.com/harmony-one/harmony/proto/identity" ) var mutex sync.Mutex diff --git a/beaconchain/beaconchain_handler.go b/beaconchain/beaconchain_handler.go index 0dc66a55f..9962ea45a 100644 --- a/beaconchain/beaconchain_handler.go +++ b/beaconchain/beaconchain_handler.go @@ -5,9 +5,9 @@ import ( "net" "os" - "github.com/simple-rules/harmony-benchmark/p2p" - "github.com/simple-rules/harmony-benchmark/proto" - proto_identity "github.com/simple-rules/harmony-benchmark/proto/identity" + "github.com/harmony-one/harmony/p2p" + "github.com/harmony-one/harmony/proto" + proto_identity "github.com/harmony-one/harmony/proto/identity" ) //BeaconChainHandler handles registration of new Identities diff --git a/benchmark.go b/benchmark.go index dfe8ab2b4..11f3a635c 100644 --- a/benchmark.go +++ b/benchmark.go @@ -9,13 +9,13 @@ import ( "runtime" "time" - "github.com/simple-rules/harmony-benchmark/attack" - "github.com/simple-rules/harmony-benchmark/consensus" - "github.com/simple-rules/harmony-benchmark/db" - "github.com/simple-rules/harmony-benchmark/log" - "github.com/simple-rules/harmony-benchmark/node" - "github.com/simple-rules/harmony-benchmark/profiler" - "github.com/simple-rules/harmony-benchmark/utils" + "github.com/harmony-one/harmony/attack" + "github.com/harmony-one/harmony/consensus" + "github.com/harmony-one/harmony/db" + "github.com/harmony-one/harmony/log" + "github.com/harmony-one/harmony/node" + "github.com/harmony-one/harmony/profiler" + "github.com/harmony-one/harmony/utils" ) var ( diff --git a/blockchain/block.go b/blockchain/block.go index 536c4f57b..5e15af014 100644 --- a/blockchain/block.go +++ b/blockchain/block.go @@ -8,8 +8,8 @@ import ( "log" "time" - "github.com/simple-rules/harmony-benchmark/db" - "github.com/simple-rules/harmony-benchmark/utils" + "github.com/harmony-one/harmony/db" + "github.com/harmony-one/harmony/utils" ) // Block is a block in the blockchain that contains block headers, transactions and signature etc. diff --git a/blockchain/blockchain.go b/blockchain/blockchain.go index 3b90e93c6..02a40668d 100644 --- a/blockchain/blockchain.go +++ b/blockchain/blockchain.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "github.com/dedis/kyber" - "github.com/simple-rules/harmony-benchmark/crypto/pki" + "github.com/harmony-one/harmony/crypto/pki" ) // Blockchain keeps a sequence of Blocks diff --git a/blockchain/blockchain_test.go b/blockchain/blockchain_test.go index 261ab9952..b718da1eb 100644 --- a/blockchain/blockchain_test.go +++ b/blockchain/blockchain_test.go @@ -3,7 +3,7 @@ package blockchain import ( "testing" - "github.com/simple-rules/harmony-benchmark/crypto/pki" + "github.com/harmony-one/harmony/crypto/pki" ) var ( diff --git a/blockchain/transaction.go b/blockchain/transaction.go index 396ee7d40..b8a4e8177 100644 --- a/blockchain/transaction.go +++ b/blockchain/transaction.go @@ -12,7 +12,7 @@ import ( "github.com/dedis/kyber" "github.com/dedis/kyber/sign/schnorr" - "github.com/simple-rules/harmony-benchmark/crypto" + "github.com/harmony-one/harmony/crypto" ) var ( diff --git a/blockchain/utxopool.go b/blockchain/utxopool.go index 59e463f23..6759e7483 100644 --- a/blockchain/utxopool.go +++ b/blockchain/utxopool.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/dedis/kyber/sign/schnorr" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/log" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/log" ) // Vout2AmountMap is a TODO type. diff --git a/client/client.go b/client/client.go index 11b98b48c..7bfa94966 100644 --- a/client/client.go +++ b/client/client.go @@ -5,12 +5,12 @@ import ( "encoding/gob" "sync" - "github.com/simple-rules/harmony-benchmark/proto/node" + "github.com/harmony-one/harmony/proto/node" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/log" - "github.com/simple-rules/harmony-benchmark/p2p" - client_proto "github.com/simple-rules/harmony-benchmark/proto/client" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/log" + "github.com/harmony-one/harmony/p2p" + client_proto "github.com/harmony-one/harmony/proto/client" ) // A client represents a node (e.g. a wallet) which sends transactions and receives responses from the harmony network diff --git a/client/config/config.go b/client/config/config.go index ff34d5465..6199e1591 100644 --- a/client/config/config.go +++ b/client/config/config.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/p2p" ) // Entry is a single config of a node. diff --git a/client/txgen/main.go b/client/txgen/main.go index 7ee389ba8..8aecfb7e5 100644 --- a/client/txgen/main.go +++ b/client/txgen/main.go @@ -12,15 +12,15 @@ import ( "sync" "time" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/client" - client_config "github.com/simple-rules/harmony-benchmark/client/config" - "github.com/simple-rules/harmony-benchmark/consensus" - "github.com/simple-rules/harmony-benchmark/crypto/pki" - "github.com/simple-rules/harmony-benchmark/log" - "github.com/simple-rules/harmony-benchmark/node" - "github.com/simple-rules/harmony-benchmark/p2p" - proto_node "github.com/simple-rules/harmony-benchmark/proto/node" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/client" + client_config "github.com/harmony-one/harmony/client/config" + "github.com/harmony-one/harmony/consensus" + "github.com/harmony-one/harmony/crypto/pki" + "github.com/harmony-one/harmony/log" + "github.com/harmony-one/harmony/node" + "github.com/harmony-one/harmony/p2p" + proto_node "github.com/harmony-one/harmony/proto/node" ) var ( diff --git a/client/utils.go b/client/utils.go index ce7e0911e..41e6e1bdf 100644 --- a/client/utils.go +++ b/client/utils.go @@ -7,7 +7,7 @@ import ( "net/http" "sync" - "github.com/simple-rules/harmony-benchmark/crypto/pki" + "github.com/harmony-one/harmony/crypto/pki" ) var AddressToIntPriKeyMap map[[20]byte]int // For convenience, we use int as the secret seed for generating private key diff --git a/client/wallet/main.go b/client/wallet/main.go index 696191f04..ed15f4e9e 100644 --- a/client/wallet/main.go +++ b/client/wallet/main.go @@ -17,15 +17,15 @@ import ( "time" "github.com/dedis/kyber" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/client" - client_config "github.com/simple-rules/harmony-benchmark/client/config" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/crypto/pki" - "github.com/simple-rules/harmony-benchmark/node" - "github.com/simple-rules/harmony-benchmark/p2p" - proto_node "github.com/simple-rules/harmony-benchmark/proto/node" - "github.com/simple-rules/harmony-benchmark/utils" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/client" + client_config "github.com/harmony-one/harmony/client/config" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/crypto/pki" + "github.com/harmony-one/harmony/node" + "github.com/harmony-one/harmony/p2p" + proto_node "github.com/harmony-one/harmony/proto/node" + "github.com/harmony-one/harmony/utils" ) func main() { diff --git a/consensus/consensus.go b/consensus/consensus.go index da179d043..75104ade4 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -8,12 +8,12 @@ import ( "github.com/dedis/kyber" "github.com/dedis/kyber/sign/schnorr" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/crypto/pki" - "github.com/simple-rules/harmony-benchmark/log" - "github.com/simple-rules/harmony-benchmark/p2p" - "github.com/simple-rules/harmony-benchmark/utils" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/crypto/pki" + "github.com/harmony-one/harmony/log" + "github.com/harmony-one/harmony/p2p" + "github.com/harmony-one/harmony/utils" ) // Consensus data containing all info related to one round of consensus process diff --git a/consensus/consensus_engine.go b/consensus/consensus_engine.go index d14b8fb67..1c8c49ba1 100644 --- a/consensus/consensus_engine.go +++ b/consensus/consensus_engine.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/consensus/consensus_leader.go b/consensus/consensus_leader.go index 93c427b1f..8e4957639 100644 --- a/consensus/consensus_leader.go +++ b/consensus/consensus_leader.go @@ -8,15 +8,15 @@ import ( "errors" "time" - "github.com/simple-rules/harmony-benchmark/profiler" + "github.com/harmony-one/harmony/profiler" "github.com/dedis/kyber" "github.com/dedis/kyber/sign/schnorr" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/log" - "github.com/simple-rules/harmony-benchmark/p2p" - proto_consensus "github.com/simple-rules/harmony-benchmark/proto/consensus" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/log" + "github.com/harmony-one/harmony/p2p" + proto_consensus "github.com/harmony-one/harmony/proto/consensus" ) var ( diff --git a/consensus/consensus_leader_msg.go b/consensus/consensus_leader_msg.go index 1e7cbab93..aa6b013d6 100644 --- a/consensus/consensus_leader_msg.go +++ b/consensus/consensus_leader_msg.go @@ -5,9 +5,9 @@ import ( "encoding/binary" "github.com/dedis/kyber" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/log" - proto_consensus "github.com/simple-rules/harmony-benchmark/proto/consensus" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/log" + proto_consensus "github.com/harmony-one/harmony/proto/consensus" ) // Constructs the announce message diff --git a/consensus/consensus_leader_msg_test.go b/consensus/consensus_leader_msg_test.go index 0b6ab8b22..471357781 100644 --- a/consensus/consensus_leader_msg_test.go +++ b/consensus/consensus_leader_msg_test.go @@ -3,10 +3,10 @@ package consensus import ( "testing" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/crypto/pki" - "github.com/simple-rules/harmony-benchmark/p2p" - consensus_proto "github.com/simple-rules/harmony-benchmark/proto/consensus" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/crypto/pki" + "github.com/harmony-one/harmony/p2p" + consensus_proto "github.com/harmony-one/harmony/proto/consensus" ) func TestConstructAnnounceMessage(test *testing.T) { diff --git a/consensus/consensus_test.go b/consensus/consensus_test.go index 99383e1b2..ec6b6dd87 100644 --- a/consensus/consensus_test.go +++ b/consensus/consensus_test.go @@ -3,7 +3,7 @@ package consensus import ( "testing" - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/p2p" ) func TestNewConsensus(test *testing.T) { diff --git a/consensus/consensus_validator.go b/consensus/consensus_validator.go index 94ddf8f6a..1a5caf6c1 100644 --- a/consensus/consensus_validator.go +++ b/consensus/consensus_validator.go @@ -6,13 +6,13 @@ import ( "encoding/gob" "github.com/dedis/kyber/sign/schnorr" - "github.com/simple-rules/harmony-benchmark/attack" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/log" - "github.com/simple-rules/harmony-benchmark/p2p" - proto_consensus "github.com/simple-rules/harmony-benchmark/proto/consensus" - "github.com/simple-rules/harmony-benchmark/utils" + "github.com/harmony-one/harmony/attack" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/log" + "github.com/harmony-one/harmony/p2p" + proto_consensus "github.com/harmony-one/harmony/proto/consensus" + "github.com/harmony-one/harmony/utils" ) // ProcessMessageValidator dispatches validator's consensus message. diff --git a/consensus/consensus_validator_msg.go b/consensus/consensus_validator_msg.go index 07a106f0d..b11c6eaa0 100644 --- a/consensus/consensus_validator_msg.go +++ b/consensus/consensus_validator_msg.go @@ -5,8 +5,8 @@ import ( "encoding/binary" "github.com/dedis/kyber" - "github.com/simple-rules/harmony-benchmark/crypto" - proto_consensus "github.com/simple-rules/harmony-benchmark/proto/consensus" + "github.com/harmony-one/harmony/crypto" + proto_consensus "github.com/harmony-one/harmony/proto/consensus" ) // Construct the commit message to send to leader (assumption the consensus data is already verified) diff --git a/consensus/consensus_validator_msg_test.go b/consensus/consensus_validator_msg_test.go index 7293a7a84..07d263c54 100644 --- a/consensus/consensus_validator_msg_test.go +++ b/consensus/consensus_validator_msg_test.go @@ -3,9 +3,9 @@ package consensus import ( "testing" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/p2p" - consensus_proto "github.com/simple-rules/harmony-benchmark/proto/consensus" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/p2p" + consensus_proto "github.com/harmony-one/harmony/proto/consensus" ) func TestConstructCommitMessage(test *testing.T) { diff --git a/core/block_validator.go b/core/block_validator.go index b35834504..36c6960fc 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -21,8 +21,8 @@ import ( "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/params" - "github.com/simple-rules/harmony-benchmark/consensus" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/consensus" + "github.com/harmony-one/harmony/core/types" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/blockchain.go b/core/blockchain.go index c9517ace8..3c4af3bd7 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -41,9 +41,9 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/trie" "github.com/hashicorp/golang-lru" - "github.com/simple-rules/harmony-benchmark/consensus" - "github.com/simple-rules/harmony-benchmark/core/rawdb" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/consensus" + "github.com/harmony-one/harmony/core/rawdb" + "github.com/harmony-one/harmony/core/types" ) var ( diff --git a/core/events.go b/core/events.go index e91c0844d..d95586182 100644 --- a/core/events.go +++ b/core/events.go @@ -18,7 +18,7 @@ package core import ( "github.com/ethereum/go-ethereum/common" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index 051b4340d..164e11adb 100644 --- a/core/evm.go +++ b/core/evm.go @@ -21,8 +21,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/vm" - "github.com/simple-rules/harmony-benchmark/consensus" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/consensus" + "github.com/harmony-one/harmony/core/types" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/headerchain.go b/core/headerchain.go index 73d05c4cb..f0a1aad15 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -31,9 +31,9 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/hashicorp/golang-lru" - "github.com/simple-rules/harmony-benchmark/consensus" - "github.com/simple-rules/harmony-benchmark/core/rawdb" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/consensus" + "github.com/harmony-one/harmony/core/rawdb" + "github.com/harmony-one/harmony/core/types" ) const ( diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index fae60af2e..0c61fecdb 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // ReadCanonicalHash retrieves the hash assigned to a canonical block number. diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index 7cc6991e0..b2289d81e 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -25,7 +25,7 @@ import ( "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/rlp" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // Tests block header storage and retrieval operations. diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index b664bf21b..e199aca03 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -20,7 +20,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // ReadTxLookupEntry retrieves the positional metadata associated with a transaction diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index d9c4c2f6d..4be8f660f 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -22,7 +22,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethdb" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // Tests that positional lookup metadata can be stored and retrieved. diff --git a/core/state_processor.go b/core/state_processor.go index 290cdfee2..905d4aa4b 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -23,8 +23,8 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/params" - "github.com/simple-rules/harmony-benchmark/consensus" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/consensus" + "github.com/harmony-one/harmony/core/types" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/tx_journal.go b/core/tx_journal.go index 3d6c1fac5..d01ae8f38 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/tx_list.go b/core/tx_list.go index a107057f4..75d091bb1 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/tx_list_test.go b/core/tx_list_test.go index 1200c6b02..e68e8257a 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/crypto" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/tx_pool.go b/core/tx_pool.go index 6b7fa4ff0..5d5ba4124 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -32,7 +32,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/params" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) const ( diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index c74d4c91a..12d9df8c7 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -32,7 +32,7 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/params" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index 1c2b19577..4920e02fb 100644 --- a/core/types.go +++ b/core/types.go @@ -19,7 +19,7 @@ package core import ( "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/vm" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core/types" ) // Validator is an interface which defines the standard for block validation. It diff --git a/crypto/pki/utils.go b/crypto/pki/utils.go index e618cf456..332fba5d6 100644 --- a/crypto/pki/utils.go +++ b/crypto/pki/utils.go @@ -3,8 +3,8 @@ package pki import ( "crypto/sha256" "github.com/dedis/kyber" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/log" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/log" ) func GetAddressFromPublicKey(pubKey kyber.Point) [20]byte { diff --git a/db/db.go b/db/db.go index 77b1dcb7d..4bd5f3db9 100644 --- a/db/db.go +++ b/db/db.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/simple-rules/harmony-benchmark/log" + "github.com/harmony-one/harmony/log" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/db/memory_db.go b/db/memory_db.go index 50efd67f4..19ed73011 100644 --- a/db/memory_db.go +++ b/db/memory_db.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/simple-rules/harmony-benchmark/utils" + "github.com/harmony-one/harmony/utils" ) // MemDatabase is the test memory database. It won't be used for any production. diff --git a/harmony/main.go b/harmony/main.go index 2d0248b03..2ece9a6e4 100644 --- a/harmony/main.go +++ b/harmony/main.go @@ -5,8 +5,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/params" - "github.com/simple-rules/harmony-benchmark/core" - "github.com/simple-rules/harmony-benchmark/core/types" + "github.com/harmony-one/harmony/core" + "github.com/harmony-one/harmony/core/types" "math/big" ) diff --git a/node/node.go b/node/node.go index 2a4a709cc..3dbe1556b 100644 --- a/node/node.go +++ b/node/node.go @@ -8,15 +8,15 @@ import ( "sync" "time" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/client" - "github.com/simple-rules/harmony-benchmark/consensus" - "github.com/simple-rules/harmony-benchmark/crypto/pki" - "github.com/simple-rules/harmony-benchmark/db" - "github.com/simple-rules/harmony-benchmark/log" - "github.com/simple-rules/harmony-benchmark/p2p" - proto_identity "github.com/simple-rules/harmony-benchmark/proto/identity" - "github.com/simple-rules/harmony-benchmark/syncing" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/client" + "github.com/harmony-one/harmony/consensus" + "github.com/harmony-one/harmony/crypto/pki" + "github.com/harmony-one/harmony/db" + "github.com/harmony-one/harmony/log" + "github.com/harmony-one/harmony/p2p" + proto_identity "github.com/harmony-one/harmony/proto/identity" + "github.com/harmony-one/harmony/syncing" ) type NetworkNode struct { diff --git a/node/node_handler.go b/node/node_handler.go index 206865f2c..3cff2b1f4 100644 --- a/node/node_handler.go +++ b/node/node_handler.go @@ -10,13 +10,13 @@ import ( "strconv" "time" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/p2p" - "github.com/simple-rules/harmony-benchmark/proto" - "github.com/simple-rules/harmony-benchmark/proto/client" - "github.com/simple-rules/harmony-benchmark/proto/consensus" - proto_identity "github.com/simple-rules/harmony-benchmark/proto/identity" - proto_node "github.com/simple-rules/harmony-benchmark/proto/node" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/p2p" + "github.com/harmony-one/harmony/proto" + "github.com/harmony-one/harmony/proto/client" + "github.com/harmony-one/harmony/proto/consensus" + proto_identity "github.com/harmony-one/harmony/proto/identity" + proto_node "github.com/harmony-one/harmony/proto/node" ) const ( diff --git a/node/node_test.go b/node/node_test.go index ad18b0f0e..7dad8db4c 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -3,8 +3,8 @@ package node import ( "testing" - "github.com/simple-rules/harmony-benchmark/consensus" - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/consensus" + "github.com/harmony-one/harmony/p2p" ) func TestNewNewNode(test *testing.T) { diff --git a/node/node_utils.go b/node/node_utils.go index 81154625c..15e2fd879 100644 --- a/node/node_utils.go +++ b/node/node_utils.go @@ -1,8 +1,8 @@ package node import ( - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/crypto/pki" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/crypto/pki" ) // AddTestingAddresses creates in genesis block numAddress transactions which assign k token to each address in [0 - numAddress) diff --git a/p2p/helper_test.go b/p2p/helper_test.go index ab4a3b4f8..c10187d80 100644 --- a/p2p/helper_test.go +++ b/p2p/helper_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/p2p" ) func setUpTestServer(times int, t *testing.T, conCreated chan struct{}) { diff --git a/p2p/ida/ida.go b/p2p/ida/ida.go index 2f15bd1f8..23351a768 100644 --- a/p2p/ida/ida.go +++ b/p2p/ida/ida.go @@ -3,7 +3,7 @@ package ida import ( "time" - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/p2p" ) // IDAImp implements IDA interface. diff --git a/p2p/ida/ida_test.go b/p2p/ida/ida_test.go index 857bc897a..d48c16644 100644 --- a/p2p/ida/ida_test.go +++ b/p2p/ida/ida_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/p2p" ) var ( diff --git a/p2p/ida/interface.go b/p2p/ida/interface.go index 03d102cc7..9a3224e1c 100644 --- a/p2p/ida/interface.go +++ b/p2p/ida/interface.go @@ -1,7 +1,7 @@ package ida import ( - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/p2p" "time" ) diff --git a/p2p/peer.go b/p2p/peer.go index 9093d7c05..4f26c91dc 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -8,7 +8,7 @@ import ( "runtime" "time" - "github.com/simple-rules/harmony-benchmark/log" + "github.com/harmony-one/harmony/log" "github.com/dedis/kyber" ) diff --git a/profiler/profiler.go b/profiler/profiler.go index 1bbef7db2..7984a6108 100644 --- a/profiler/profiler.go +++ b/profiler/profiler.go @@ -9,7 +9,7 @@ import ( "time" "github.com/shirou/gopsutil/process" - "github.com/simple-rules/harmony-benchmark/log" + "github.com/harmony-one/harmony/log" ) type Profiler struct { diff --git a/proto/client/client.go b/proto/client/client.go index 4897478c9..f06d6ebd7 100644 --- a/proto/client/client.go +++ b/proto/client/client.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/gob" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/proto" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/proto" ) // The specific types of message under CLIENT category diff --git a/proto/consensus/consensus.go b/proto/consensus/consensus.go index 653d864d2..d389dd4fb 100644 --- a/proto/consensus/consensus.go +++ b/proto/consensus/consensus.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" - "github.com/simple-rules/harmony-benchmark/proto" + "github.com/harmony-one/harmony/proto" ) /* diff --git a/proto/identity/identity.go b/proto/identity/identity.go index 4128548cf..8bf76ca86 100644 --- a/proto/identity/identity.go +++ b/proto/identity/identity.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" - "github.com/simple-rules/harmony-benchmark/proto" + "github.com/harmony-one/harmony/proto" ) // IdentityMessageTypeBytes is the number of bytes consensus message type occupies diff --git a/proto/node/node.go b/proto/node/node.go index ffdc25525..668c44257 100644 --- a/proto/node/node.go +++ b/proto/node/node.go @@ -5,9 +5,9 @@ import ( "encoding/gob" "log" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/p2p" - "github.com/simple-rules/harmony-benchmark/proto" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/p2p" + "github.com/harmony-one/harmony/proto" ) // NodeMessageType is to indicate the specific type of message under NODE category diff --git a/runid/run-identity.go b/runid/run-identity.go index fa9db2c5e..a8dd5293c 100644 --- a/runid/run-identity.go +++ b/runid/run-identity.go @@ -1,7 +1,7 @@ package main import ( - "github.com/simple-rules/harmony-benchmark/beaconchain" + "github.com/harmony-one/harmony/beaconchain" ) func main() { diff --git a/runnode/run-node.go b/runnode/run-node.go index c62296cc4..ae7793001 100644 --- a/runnode/run-node.go +++ b/runnode/run-node.go @@ -4,8 +4,8 @@ import ( "flag" "time" - "github.com/simple-rules/harmony-benchmark/node" - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/node" + "github.com/harmony-one/harmony/p2p" ) func main() { diff --git a/syncing/syncing.go b/syncing/syncing.go index 69c90cf5e..d6029ef14 100644 --- a/syncing/syncing.go +++ b/syncing/syncing.go @@ -7,9 +7,9 @@ import ( "time" "github.com/Workiva/go-datastructures/queue" - "github.com/simple-rules/harmony-benchmark/blockchain" - "github.com/simple-rules/harmony-benchmark/p2p" - proto_node "github.com/simple-rules/harmony-benchmark/proto/node" + "github.com/harmony-one/harmony/blockchain" + "github.com/harmony-one/harmony/p2p" + proto_node "github.com/harmony-one/harmony/proto/node" ) type SyncPeerConfig struct { diff --git a/utils/distribution_config.go b/utils/distribution_config.go index 9ffa74683..55ccb8cfa 100644 --- a/utils/distribution_config.go +++ b/utils/distribution_config.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/simple-rules/harmony-benchmark/crypto" - "github.com/simple-rules/harmony-benchmark/crypto/pki" - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/crypto" + "github.com/harmony-one/harmony/crypto/pki" + "github.com/harmony-one/harmony/p2p" ) type ConfigEntry struct { diff --git a/utils/utils.go b/utils/utils.go index 4097edf35..7215a626b 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -8,7 +8,7 @@ import ( "regexp" "strconv" - "github.com/simple-rules/harmony-benchmark/p2p" + "github.com/harmony-one/harmony/p2p" ) // ConvertFixedDataIntoByteArray converts an empty interface data to a byte array