realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#496] pkg/innerring: provide wrappers to processors

Browse source 
The only thing we need hashes for is to process notifications.
Balance contract if left for now, as it has some initialization.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-05-31 14:50:11 +03:00 • committed by Alex Vanin
parent 9b87e6267d
commit 8a2b7f4501
24 changed files with 215 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkg/innerring/processors/netmap/process_peers.go
View file

@ -10,8 +10,6 @@ import (
"go.uber.org/zap"
)
const approvePeerMethod = "addPeer"
// Process add peer notification by sanity check of new node
// local epoch timer.
func (np *Processor) processAddPeer(node []byte) {
@ -52,14 +50,6 @@ func (np *Processor) processAddPeer(node []byte) {
})
nodeInfo.SetAttributes(a...)
// marshal node info back to binary
node, err = nodeInfo.Marshal()
if err != nil {
np.log.Warn("can't marshal approved network map candidate",
zap.String("error", err.Error()))
return
}
keyString := hex.EncodeToString(nodeInfo.PublicKey())
exists := np.netmapSnapshot.touch(keyString, np.epochState.EpochCounter())
@ -67,7 +57,7 @@ func (np *Processor) processAddPeer(node []byte) {
np.log.Info("approving network map candidate",
zap.String("key", keyString))
err := np.morphClient.NotaryInvoke(np.netmapContract, np.feeProvider.SideChainFee(), approvePeerMethod, node)
err := np.netmapClient.AddPeer(nodeInfo)
if err != nil {
np.log.Error("can't invoke netmap.AddPeer", zap.Error(err))
}
@ -94,9 +84,7 @@ func (np *Processor) processUpdatePeer(ev netmapEvent.UpdatePeer) {
// again before new epoch will tick
np.netmapSnapshot.flag(hex.EncodeToString(ev.PublicKey().Bytes()))
err := np.morphClient.NotaryInvoke(np.netmapContract, np.feeProvider.SideChainFee(), updatePeerStateMethod,
int64(ev.Status().ToV2()),
ev.PublicKey().Bytes())
err := np.netmapClient.UpdatePeerState(ev.PublicKey().Bytes(), ev.Status())
if err != nil {
np.log.Error("can't invoke netmap.UpdatePeer", zap.Error(err))
}