[#483] morph/client: Throw panic if notary methods are not initialized
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
parent
477682adb7
commit
7acfc85f8a
1 changed files with 27 additions and 18 deletions
|
@ -48,12 +48,10 @@ const (
|
||||||
setDesignateMethod = "designateAsRole"
|
setDesignateMethod = "designateAsRole"
|
||||||
|
|
||||||
notaryBalanceErrMsg = "can't fetch notary balance"
|
notaryBalanceErrMsg = "can't fetch notary balance"
|
||||||
|
notaryNotEnabledPanicMsg = "notary support was not enabled on this client"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var errUnexpectedItems = errors.New("invalid number of NEO VM arguments on stack")
|
||||||
errNotaryNotEnabled = errors.New("notary support was not enabled on this client")
|
|
||||||
errUnexpectedItems = errors.New("invalid number of NEO VM arguments on stack")
|
|
||||||
)
|
|
||||||
|
|
||||||
func defaultNotaryConfig() *notaryCfg {
|
func defaultNotaryConfig() *notaryCfg {
|
||||||
return ¬aryCfg{
|
return ¬aryCfg{
|
||||||
|
@ -95,9 +93,12 @@ func (c *Client) EnableNotarySupport(proxy, netmap util.Uint160, opts ...NotaryO
|
||||||
// if main tx failed to create. Deposit isn't last forever, so it should
|
// if main tx failed to create. Deposit isn't last forever, so it should
|
||||||
// be called periodically. Notary support should be enabled in client to
|
// be called periodically. Notary support should be enabled in client to
|
||||||
// use this function.
|
// use this function.
|
||||||
|
//
|
||||||
|
// This function must be invoked after `EnableNotarySupport()` otherwise it
|
||||||
|
// throws panic.
|
||||||
func (c *Client) DepositNotary(amount fixedn.Fixed8, delta uint32) error {
|
func (c *Client) DepositNotary(amount fixedn.Fixed8, delta uint32) error {
|
||||||
if c.notary == nil {
|
if c.notary == nil {
|
||||||
return errNotaryNotEnabled
|
panic(notaryNotEnabledPanicMsg)
|
||||||
}
|
}
|
||||||
|
|
||||||
bc, err := c.client.GetBlockCount()
|
bc, err := c.client.GetBlockCount()
|
||||||
|
@ -127,9 +128,12 @@ func (c *Client) DepositNotary(amount fixedn.Fixed8, delta uint32) error {
|
||||||
|
|
||||||
// GetNotaryDeposit returns deposit of client's account in notary contract.
|
// GetNotaryDeposit returns deposit of client's account in notary contract.
|
||||||
// Notary support should be enabled in client to use this function.
|
// Notary support should be enabled in client to use this function.
|
||||||
|
//
|
||||||
|
// This function must be invoked after `EnableNotarySupport()` otherwise it
|
||||||
|
// throws panic.
|
||||||
func (c *Client) GetNotaryDeposit() (int64, error) {
|
func (c *Client) GetNotaryDeposit() (int64, error) {
|
||||||
if c.notary == nil {
|
if c.notary == nil {
|
||||||
return 0, errNotaryNotEnabled
|
panic(notaryNotEnabledPanicMsg)
|
||||||
}
|
}
|
||||||
|
|
||||||
sh := c.acc.PrivateKey().PublicKey().GetScriptHash()
|
sh := c.acc.PrivateKey().PublicKey().GetScriptHash()
|
||||||
|
@ -153,9 +157,12 @@ func (c *Client) GetNotaryDeposit() (int64, error) {
|
||||||
|
|
||||||
// UpdateNotaryList updates list of notary nodes in designate contract. Requires
|
// UpdateNotaryList updates list of notary nodes in designate contract. Requires
|
||||||
// committee multi signature.
|
// committee multi signature.
|
||||||
|
//
|
||||||
|
// This function must be invoked after `EnableNotarySupport()` otherwise it
|
||||||
|
// throws panic.
|
||||||
func (c *Client) UpdateNotaryList(list keys.PublicKeys) error {
|
func (c *Client) UpdateNotaryList(list keys.PublicKeys) error {
|
||||||
if c.notary == nil {
|
if c.notary == nil {
|
||||||
return errNotaryNotEnabled
|
panic(notaryNotEnabledPanicMsg)
|
||||||
}
|
}
|
||||||
|
|
||||||
return c.notaryInvokeAsCommittee(c.designate,
|
return c.notaryInvokeAsCommittee(c.designate,
|
||||||
|
@ -168,9 +175,12 @@ func (c *Client) UpdateNotaryList(list keys.PublicKeys) error {
|
||||||
// UpdateNeoFSAlphabetList updates list of alphabet nodes in designate contract.
|
// UpdateNeoFSAlphabetList updates list of alphabet nodes in designate contract.
|
||||||
// As for side chain list should contain all inner ring nodes.
|
// As for side chain list should contain all inner ring nodes.
|
||||||
// Requires committee multi signature.
|
// Requires committee multi signature.
|
||||||
|
//
|
||||||
|
// This function must be invoked after `EnableNotarySupport()` otherwise it
|
||||||
|
// throws panic.
|
||||||
func (c *Client) UpdateNeoFSAlphabetList(list keys.PublicKeys) error {
|
func (c *Client) UpdateNeoFSAlphabetList(list keys.PublicKeys) error {
|
||||||
if c.notary == nil {
|
if c.notary == nil {
|
||||||
return errNotaryNotEnabled
|
panic(notaryNotEnabledPanicMsg)
|
||||||
}
|
}
|
||||||
|
|
||||||
return c.notaryInvokeAsCommittee(c.designate,
|
return c.notaryInvokeAsCommittee(c.designate,
|
||||||
|
@ -180,12 +190,17 @@ func (c *Client) UpdateNeoFSAlphabetList(list keys.PublicKeys) error {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Invoke invokes contract method by sending tx to notary contract in
|
// NotaryInvoke invokes contract method by sending tx to notary contract in
|
||||||
// blockchain. Fallback tx is a `RET`. Notary support should be enabled
|
// blockchain. Fallback tx is a `RET`. Notary support should be enabled
|
||||||
// in client to use this function.
|
// in client to use this function.
|
||||||
//
|
//
|
||||||
// Supported args types: int64, string, util.Uint160, []byte and bool.
|
// This function must be invoked after `EnableNotarySupport()` otherwise it
|
||||||
|
// throws panic.
|
||||||
func (c *Client) NotaryInvoke(contract util.Uint160, method string, args ...interface{}) error {
|
func (c *Client) NotaryInvoke(contract util.Uint160, method string, args ...interface{}) error {
|
||||||
|
if c.notary == nil {
|
||||||
|
panic(notaryNotEnabledPanicMsg)
|
||||||
|
}
|
||||||
|
|
||||||
return c.notaryInvoke(false, contract, method, args...)
|
return c.notaryInvoke(false, contract, method, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -194,13 +209,7 @@ func (c *Client) notaryInvokeAsCommittee(contract util.Uint160, method string, a
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) notaryInvoke(committee bool, contract util.Uint160, method string, args ...interface{}) error {
|
func (c *Client) notaryInvoke(committee bool, contract util.Uint160, method string, args ...interface{}) error {
|
||||||
if c.notary == nil {
|
alphabetList, err := c.Committee() // prepare arguments for test invocation
|
||||||
return errNotaryNotEnabled
|
|
||||||
}
|
|
||||||
|
|
||||||
// prepare arguments for test invocation
|
|
||||||
|
|
||||||
alphabetList, err := c.Committee()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue