Revert "move demo addresses to test folder"

This reverts commit a8a9953a82.
pull/1251/head
Leo Chen 5 years ago
parent 833c1f2de5
commit b29a3a2a4a
  1. 2
      node/demo_constants.go
  2. 7
      node/node_genesis.go

@ -1,4 +1,4 @@
package demo package node
// DeployAccount is the accounts used for development. // DeployAccount is the accounts used for development.
type DeployAccount struct { type DeployAccount struct {

@ -8,6 +8,9 @@ import (
"strings" "strings"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
@ -15,10 +18,8 @@ import (
"github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
common2 "github.com/harmony-one/harmony/internal/common" common2 "github.com/harmony-one/harmony/internal/common"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
"github.com/harmony-one/harmony/internal/genesis" "github.com/harmony-one/harmony/internal/genesis"
"github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/internal/utils"
demo "github.com/harmony-one/harmony/test/demo"
) )
const ( const (
@ -154,7 +155,7 @@ func AddNodeAddressesToGenesisAlloc(genesisAlloc core.GenesisAlloc) {
// AddDemoAddressesToGenesisAlloc funds demo addresses with free fund. // AddDemoAddressesToGenesisAlloc funds demo addresses with free fund.
func AddDemoAddressesToGenesisAlloc(genesisAlloc core.GenesisAlloc) { func AddDemoAddressesToGenesisAlloc(genesisAlloc core.GenesisAlloc) {
for _, account := range demo.DemoAccounts { for _, account := range DemoAccounts {
testBankFunds := big.NewInt(InitFreeFund) testBankFunds := big.NewInt(InitFreeFund)
testBankFunds = testBankFunds.Mul(testBankFunds, big.NewInt(params.Ether)) testBankFunds = testBankFunds.Mul(testBankFunds, big.NewInt(params.Ether))
address := common.HexToAddress(account.Address) address := common.HexToAddress(account.Address)

Loading…
Cancel
Save