clean up which addresses get used where

This commit is contained in:
whyrusleeping 2019-07-26 10:33:54 -07:00
parent a825b3b550
commit a0c1afff57
5 changed files with 4 additions and 29 deletions

View File

@ -20,21 +20,6 @@ func init() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
NetworkAddress, err = NewActorAddress([]byte("filecoin"))
if err != nil {
panic(err)
}
StorageMarketAddress, err = NewActorAddress([]byte("storage"))
if err != nil {
panic(err)
}
PaymentBrokerAddress, err = NewActorAddress([]byte("payments"))
if err != nil {
panic(err)
}
} }
var ( var (
@ -42,13 +27,6 @@ var (
TestAddress Address TestAddress Address
// TestAddress2 is an account with some initial funds in it. // TestAddress2 is an account with some initial funds in it.
TestAddress2 Address TestAddress2 Address
// NetworkAddress is the filecoin network.
NetworkAddress Address
// StorageMarketAddress is the hard-coded address of the filecoin storage market.
StorageMarketAddress Address
// PaymentBrokerAddress is the hard-coded address of the filecoin storage market.
PaymentBrokerAddress Address
) )
var ( var (

View File

@ -34,7 +34,7 @@ func makeActor(st *state.StateTree, addr address.Address) (*types.Actor, error)
case address.ID: case address.ID:
return nil, fmt.Errorf("no actor with given ID") return nil, fmt.Errorf("no actor with given ID")
case address.Actor: case address.Actor:
return nil, fmt.Errorf("no such actor") return nil, fmt.Errorf("no such actor: %s", addr)
default: default:
return nil, fmt.Errorf("address has unsupported protocol: %d", addr.Protocol()) return nil, fmt.Errorf("address has unsupported protocol: %d", addr.Protocol())
} }

View File

@ -252,7 +252,7 @@ func (vm *VM) ApplyMessage(msg *types.Message) (*types.MessageReceipt, error) {
// reward miner gas fees // reward miner gas fees
miner, err := st.GetActor(vm.blockMiner) miner, err := st.GetActor(vm.blockMiner)
if err != nil { if err != nil {
return nil, xerrors.Errorf("getting block miner actor failed: %w", err) return nil, xerrors.Errorf("getting block miner actor (%s) failed: %w", vm.blockMiner, err)
} }
gasReward := types.BigMul(msg.GasPrice, vmctx.GasUsed()) gasReward := types.BigMul(msg.GasPrice, vmctx.GasUsed())

View File

@ -5,8 +5,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"gopkg.in/urfave/cli.v2" "gopkg.in/urfave/cli.v2"
"github.com/filecoin-project/go-lotus/chain/address"
) )
var minerCmd = &cli.Command{ var minerCmd = &cli.Command{
@ -29,7 +27,7 @@ var minerStart = &cli.Command{
ctx := ReqContext(cctx) ctx := ReqContext(cctx)
// TODO: this address needs to be the address of an actual miner // TODO: this address needs to be the address of an actual miner
maddr, err := address.NewIDAddress(523423423) maddr, err := api.WalletDefaultAddress(ctx)
if err != nil { if err != nil {
return errors.Wrap(err, "failed to create miner address") return errors.Wrap(err, "failed to create miner address")
} }

View File

@ -8,7 +8,6 @@ import (
"github.com/filecoin-project/go-lotus/build" "github.com/filecoin-project/go-lotus/build"
"github.com/filecoin-project/go-lotus/chain" "github.com/filecoin-project/go-lotus/chain"
"github.com/filecoin-project/go-lotus/chain/actors" "github.com/filecoin-project/go-lotus/chain/actors"
"github.com/filecoin-project/go-lotus/chain/address"
"github.com/filecoin-project/go-lotus/chain/types" "github.com/filecoin-project/go-lotus/chain/types"
lcli "github.com/filecoin-project/go-lotus/cli" lcli "github.com/filecoin-project/go-lotus/cli"
"github.com/filecoin-project/go-lotus/node/repo" "github.com/filecoin-project/go-lotus/node/repo"
@ -119,7 +118,7 @@ var initCmd = &cli.Command{
} }
createStorageMinerMsg := types.Message{ createStorageMinerMsg := types.Message{
To: address.StorageMarketAddress, To: actors.StorageMarketAddress,
From: defOwner, From: defOwner,
Nonce: nonce, Nonce: nonce,