refactoring and tests

Author: miiu96

server/services/blockService.go

@@ -220,7 +220,7 @@ func (service *blockService) convertToRosettaBlock(block *api.Block) (*types.Blo
 		Block: &types.Block{
 			BlockIdentifier:       blockToIdentifier(block),
 			ParentBlockIdentifier: parentBlockIdentifier,
-			Timestamp:             getTimestamp(block.Timestamp, block.TimestampMs),
+			Timestamp:             getTimestampInMS(block.Timestamp, block.TimestampMs),
 			Transactions:          transactions,
 			Metadata: objectsMap{
 				"shard":  block.Shard,

server/services/converters.go

@@ -72,11 +72,11 @@ func timestampInMilliseconds(timestamp int64) int64 {
 	return timestamp * 1000
 }
 
-func getTimestamp(timestamp int64, timestampMS int64) int64 {
+func getTimestampInMS(timestampSec int64, timestampMS int64) int64 {
 	if timestampMS > 0 {
 		return timestampMS
 	}
-	return timestampInMilliseconds(timestamp)
+	return timestampInMilliseconds(timestampSec)
 }
 
 func stringToHex(value string) string {

server/services/converters_test.go

@@ -64,3 +64,10 @@ func TestHexToAmount(t *testing.T) {
 	require.Nil(t, err)
 	require.Equal(t, "100", amount)
 }
+
+func TestGetTimestamp(t *testing.T) {
+
+	require.Equal(t, int64(0), getTimestampInMS(0, 0))
+	require.Equal(t, int64(500000), getTimestampInMS(500, 0))
+	require.Equal(t, int64(500200), getTimestampInMS(500, 500200))
+}

server/services/networkService.go

@@ -56,7 +56,7 @@ func (service *networkService) NetworkStatus(
 
 	networkStatusResponse := &types.NetworkStatusResponse{
 		CurrentBlockIdentifier: blockSummaryToIdentifier(&nodeStatus.LatestBlock),
-		CurrentBlockTimestamp:  getTimestamp(nodeStatus.LatestBlock.Timestamp, nodeStatus.LatestBlock.TimestampMs),
+		CurrentBlockTimestamp:  getTimestampInMS(nodeStatus.LatestBlock.Timestamp, nodeStatus.LatestBlock.TimestampMs),
 		GenesisBlockIdentifier: service.extension.getGenesisBlockIdentifier(),
 		OldestBlockIdentifier:  blockSummaryToIdentifier(&nodeStatus.OldestBlockWithHistoricalState),
 		SyncStatus: &types.SyncStatus{