pbft contract: cosmetic

Author: valdok

bvm/Shaders/pbft/contract.cpp

@@ -79,7 +79,7 @@ BEAM_EXPORT void Ctor(const Method::Create& r)
 
     for (uint32_t i = 0; i < r.m_Validators; i++)
     {
-        const auto& v = ((const ValidatorInit*)(&r + 1))[i];
+        const auto& v = ((const State::Validator::Init*)(&r + 1))[i];
         _POD_(vk.m_Address) = v.m_Address;
 
         Env::Halt_if(!v.m_Stake);

bvm/Shaders/pbft/contract.h

@@ -14,12 +14,6 @@ namespace PBFT
 
     typedef HashValue Address;
 
-    struct ValidatorInit {
-        Address m_Address;
-        Amount m_Stake;
-        PubKey m_Delegator;
-    };
-
     // The contract implements the following logic:
     //
     // 1. At each block the node needs the current validator set. The info node needs is:
@@ -143,6 +137,12 @@ namespace PBFT
             // this is the part of interest to the node.
             uint64_t m_Weight;
             uint8_t m_Flags;
+
+            struct Init {
+                Address m_Address;
+                Amount m_Stake;
+                PubKey m_Delegator;
+            };
         };
 
         struct ValidatorPlus
@@ -259,7 +259,7 @@ namespace PBFT
             static const uint32_t s_iMethod = 0;
             Settings m_Settings;
             uint32_t m_Validators;
-            // followed by array of ValidatorInit structs
+            // followed by array of Validator::Init structs
         };
 
         struct ValidatorStatusUpdate

bvm/unittest/shaders_test.cpp

@@ -2250,7 +2250,7 @@ namespace bvm2 {
 			struct Args
 				:public Shaders::PBFT::Method::Create
 			{
-				Shaders::PBFT::ValidatorInit m_pVals[nValidators];
+				Shaders::PBFT::State::Validator::Init m_pVals[nValidators];
 			} args;
 #pragma pack (pop)
 

node/unittests/node_test.cpp

@@ -1865,7 +1865,7 @@ namespace beam
 				Shaders::PBFT::Method::Create m;
 				ZeroObject(m);
 
-				std::vector<Shaders::PBFT::ValidatorInit> vVals;
+				std::vector<Shaders::PBFT::State::Validator::Init> vVals;
 				ECC::Scalar::Native sk;
 
 				m.m_Validators = 2;
@@ -1881,11 +1881,11 @@ namespace beam
 				vVals[0].m_Stake = Rules::Coin * 700;
 				vVals[1].m_Stake = Rules::Coin * 700;
 
-				pKrn->m_Args.resize(sizeof(m) + sizeof(Shaders::PBFT::ValidatorInit) * m.m_Validators);
+				pKrn->m_Args.resize(sizeof(m) + sizeof(Shaders::PBFT::State::Validator::Init) * m.m_Validators);
 				memcpy(&pKrn->m_Args.front(), &m, sizeof(m));
 
 				if (m.m_Validators)
-					memcpy(&pKrn->m_Args.front() + sizeof(m), &vVals.front(), sizeof(Shaders::PBFT::ValidatorInit) * m.m_Validators);
+					memcpy(&pKrn->m_Args.front() + sizeof(m), &vVals.front(), sizeof(Shaders::PBFT::State::Validator::Init) * m.m_Validators);
 
 				ECC::SetRandom(sk);
 				ECC::Point::Native ptFunds(beam::Zero);

wallet/unittests/wallet_test.cpp

@@ -2982,7 +2982,7 @@ namespace
                 m.m_Validators = s_Validators;
                 m.m_Settings.m_aidStake = 7;
 
-				std::vector<Shaders::PBFT::ValidatorInit> vVals;
+				std::vector<Shaders::PBFT::State::Validator::Init> vVals;
 				ECC::Scalar::Native sk;
 
 				vVals.resize(s_Validators);
@@ -2993,11 +2993,11 @@ namespace
                     vVals[i].m_Stake = Rules::Coin * 5000;
                 }
 
-				pKrn->m_Args.resize(sizeof(m) + sizeof(Shaders::PBFT::ValidatorInit) * m.m_Validators);
+				pKrn->m_Args.resize(sizeof(m) + sizeof(Shaders::PBFT::State::Validator::Init) * m.m_Validators);
 				memcpy(&pKrn->m_Args.front(), &m, sizeof(m));
 
 				if (m.m_Validators)
-					memcpy(&pKrn->m_Args.front() + sizeof(m), &vVals.front(), sizeof(Shaders::PBFT::ValidatorInit) * m.m_Validators);
+					memcpy(&pKrn->m_Args.front() + sizeof(m), &vVals.front(), sizeof(Shaders::PBFT::State::Validator::Init) * m.m_Validators);
 
 				sk.GenRandomNnz();
 				ECC::Point::Native ptFunds(beam::Zero);