cargo fmt

Author: sntntn

goCode/internal/config/config.go

@@ -10,7 +10,7 @@ import (
 func LoadEnv() (string, string, string) {
 	err := godotenv.Load("../.env")
 	if err != nil {
-		log.Fatal("Greska pri učitavanju .env fajla")
+		log.Fatal("Greska pri ucitavanju .env fajla")
 	}
 
 	rpcURL := os.Getenv("RPC_URL")

goCode/internal/rpc/rpc.go

@@ -32,7 +32,7 @@ func GetLatestBlock(rpcURL string) string {
 	// Citamo telo odgovora
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		log.Fatalf("Greska pri čitanju odgovora: %v", err)
+		log.Fatalf("Greska pri citanju odgovora: %v", err)
 	}
 
 	// Parsiramo odgovor

goCode/internal/transaction/transaction.go

@@ -1,10 +1,10 @@
 package transaction
 
 import (
-	"goCode/internal/utilis"
 	"context"
 	"crypto/ecdsa"
 	"fmt"
+	"goCode/internal/utilis"
 	"log"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -25,7 +25,7 @@ func SendTransaction(rpcURL string, recipientAddress string, sendEth int64, priv
 		log.Fatalf("Neuspesna konverzija privatnog kljuca: %v", err)
 	}
 
-	// Adresa pošiljaoca
+	// Adresa posiljaoca
 	publicKey := privateKey.Public().(*ecdsa.PublicKey)
 	fromAddress := crypto.PubkeyToAddress(*publicKey)
 
@@ -51,7 +51,7 @@ func SendTransaction(rpcURL string, recipientAddress string, sendEth int64, priv
 	// Potpisivanje transakcije
 	chainID, err := client.NetworkID(context.Background())
 	if err != nil {
-		log.Fatalf("Greska pri dohvatanju ID mreže: %v", err)
+		log.Fatalf("Greska pri dohvatanju ID mreze: %v", err)
 	}
 	signedTx, err := types.SignTx(tx, types.NewEIP155Signer(chainID), privateKey)
 	if err != nil {

rustCode/src/config/mod.rs

@@ -1,11 +1,11 @@
-use std::{env, path::Path};
-use dotenvy::from_path;
-
-pub fn load_env() {
-    let env_path = Path::new("../goCode/.env");
-    from_path(env_path).expect("Nije moguce ucitati .env fajl sa date putanje");
-}
-
-pub fn get_rpc_url() -> String {
-    env::var("RPC_URL").expect("RPC_URL nije definisan")
-}
+use dotenvy::from_path;
+use std::{env, path::Path};
+
+pub fn load_env() {
+    let env_path = Path::new("../goCode/.env");
+    from_path(env_path).expect("Nije moguce ucitati .env fajl sa date putanje");
+}
+
+pub fn get_rpc_url() -> String {
+    env::var("RPC_URL").expect("RPC_URL nije definisan")
+}

rustCode/src/lib.rs

@@ -1,31 +1,35 @@
-pub mod rpc;
 pub mod models;
-
+pub mod rpc;
 
 use crate::rpc::fetch::fetch_latest_block;
 use std::ffi::CString;
-use std::os::raw::c_char; 
-use crate::models::SimpleBlock;
-
+use std::os::raw::c_char;
 
 #[no_mangle]
 pub extern "C" fn fetch_transactions(rpc_url: *const c_char) -> *mut c_char {
     // Pretvaranje C stringa u Rust string
     let c_str = unsafe { std::ffi::CStr::from_ptr(rpc_url) };
     let rpc_url_str = c_str.to_str().unwrap();
     // Pozivanje fetch_latest_block funkcije za dobijanje najnovijeg bloka
-    let future = tokio::runtime::Runtime::new().unwrap().block_on(fetch_latest_block(rpc_url_str));
+    let future = tokio::runtime::Runtime::new()
+        .unwrap()
+        .block_on(fetch_latest_block(rpc_url_str));
 
     // Prikupljanje transakcija iz rezultata
     let mut transaction_data = String::new();
     for tx in &future.transactions {
-        transaction_data.push_str(&format!("Tx hash: {}\nFrom: {}\nTo: {}\nValue: {}\nGas: {}\n\n",
-                                          tx.hash, tx.from, tx.to.clone().unwrap_or_else(|| "N/A".into()),
-                                          tx.value, tx.gas));
+        transaction_data.push_str(&format!(
+            "Tx hash: {}\nFrom: {}\nTo: {}\nValue: {}\nGas: {}\n\n",
+            tx.hash,
+            tx.from,
+            tx.to.clone().unwrap_or_else(|| "N/A".into()),
+            tx.value,
+            tx.gas
+        ));
     }
 
     let c_str_result = CString::new(transaction_data).unwrap();
 
-    // Vraćanje C stringa koji Go može koristiti
+    // Vracanje C stringa koji Go moye koristiti
     c_str_result.into_raw()
 }

rustCode/src/main.rs

@@ -1,10 +1,10 @@
 mod config;
-mod rpc;
 mod models;
+mod rpc;
 
-use rpc::fetch::{fetch_latest_block};
-use config::{load_env, get_rpc_url};
+use config::{get_rpc_url, load_env};
 use models::SimpleBlock;
+use rpc::fetch::fetch_latest_block;
 use tokio;
 
 fn print_block_info(block: &SimpleBlock) {

rustCode/src/models/mod.rs

@@ -1,28 +1,28 @@
-use serde::{Deserialize};
-
-#[derive(Debug, Deserialize)]
-pub struct RPCResponse {
-    pub result: SimpleBlock,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SimpleBlock {
-    pub number: String,
-    pub hash: String,
-    pub timestamp: String,
-    pub gas_used: String,
-    pub transactions: Vec<SimpleTransaction>,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct SimpleTransaction {
-    pub hash: String,
-    pub from: String,
-    pub to: Option<String>,
-    pub value: String,
-    pub gas: String,
-    
-    #[serde(rename = "gasPrice")]
-    pub gas_price: String,
-}
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+pub struct RPCResponse {
+    pub result: SimpleBlock,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SimpleBlock {
+    pub number: String,
+    pub hash: String,
+    pub timestamp: String,
+    pub gas_used: String,
+    pub transactions: Vec<SimpleTransaction>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct SimpleTransaction {
+    pub hash: String,
+    pub from: String,
+    pub to: Option<String>,
+    pub value: String,
+    pub gas: String,
+
+    #[serde(rename = "gasPrice")]
+    pub gas_price: String,
+}

rustCode/src/rpc/fetch.rs

@@ -1,7 +1,6 @@
+use crate::models::{RPCResponse, SimpleBlock};
 use reqwest::Client;
 use serde_json::json;
-use crate::models::{RPCResponse, SimpleBlock};
-
 
 pub async fn fetch_latest_block(rpc_url: &str) -> SimpleBlock {
     let req_body = json!( {
@@ -19,33 +18,7 @@ pub async fn fetch_latest_block(rpc_url: &str) -> SimpleBlock {
         .await
         .expect("Greska pri slanju zahteva");
 
-    let resp_json: RPCResponse = resp
-        .json()
-        .await
-        .expect("Greska pri parsiranju odgovora");
+    let resp_json: RPCResponse = resp.json().await.expect("Greska pri parsiranju odgovora");
 
     resp_json.result
-}
-
-// #[no_mangle]
-// pub extern "C" fn fetch_transactions(rpc_url: *const c_char) -> *mut c_char {
-//     // Pretvaranje C stringa u Rust string
-//     let c_str = unsafe { CString::from_raw(rpc_url as *mut c_char) };
-//     let rpc_url_str = c_str.to_str().unwrap();
-
-//     // Pozivanje fetch_latest_block funkcije za dobijanje najnovijeg bloka
-//     let future = tokio::runtime::Runtime::new().unwrap().block_on(fetch_latest_block(rpc_url_str));
-
-//     // Prikupljanje transakcija iz rezultata
-//     let mut transaction_data = String::new();
-//     for tx in &future.transactions {
-//         transaction_data.push_str(&format!("Tx hash: {}\nFrom: {}\nTo: {}\nValue: {}\nGas: {}\n\n",
-//                                           tx.hash, tx.from, tx.to.clone().unwrap_or_else(|| "N/A".into()),
-//                                           tx.value, tx.gas));
-//     }
-
-//     let c_str_result = CString::new(transaction_data).unwrap();
-
-//     // Vraćanje C stringa koji Go može koristiti
-//     c_str_result.into_raw()
-// }
+}