changing contract location column for requester peer location in cont…

…ract details
freenet · Oct 11, 2024 · 19c268e · 19c268e
1 parent a9a72d6
commit 19c268e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/crates/core/src/tracing.rs b/crates/core/src/tracing.rs
@@ -217,7 +217,7 @@ impl<'a> NetEventLog<'a> {
                 id,
                 ..
             }) => {
-                let this_peer = &op_manager.ring.connection_manager.get_peer_key().unwrap();
+                let this_peer = &op_manager.ring.connection_manager.own_location();
                 let key = contract.key();
                 EventKind::Put(PutEvent::Request {
                     requester: this_peer.clone(),
@@ -267,7 +267,7 @@ impl<'a> NetEventLog<'a> {
                 ..
             }) => EventKind::Put(PutEvent::BroadcastReceived {
                 id: *id,
-                requester: sender.peer.clone(),
+                requester: sender.clone(),
                 key: *key,
                 value: new_value.clone(),
                 target: target.clone(),
@@ -978,7 +978,7 @@ enum ConnectEvent {
 enum PutEvent {
     Request {
         id: Transaction,
-        requester: PeerId,
+        requester: PeerKeyLocation,
         key: ContractKey,
         target: PeerKeyLocation,
         timestamp: u64,
@@ -1006,7 +1006,7 @@ enum PutEvent {
     BroadcastReceived {
         id: Transaction,
         /// peer who started the broadcast op
-        requester: PeerId,
+        requester: PeerKeyLocation,
         /// key of the contract which value was being updated
         key: ContractKey,
         /// value that was put

diff --git a/network-monitor/src/contract-detail.tsx b/network-monitor/src/contract-detail.tsx
@@ -146,7 +146,8 @@ const ContractPeersHistory = ({
                             )}
                         </th>
                         <th>
-                            Contract Location
+                            Requester <br /> 
+                            Peer Location
                         </th>
                         <th>
                             Transaction Id
@@ -220,7 +221,7 @@ const ContractPeersHistory = ({
                                 {tx.contract_id.slice(-8)}
                             </td>
                             <td>
-                                {tx.contract_location}
+                                {tx.requester_location}
                             </td>
                             <td
                                 onClick={() =>
@@ -379,7 +380,7 @@ export const ContractDetail = ({
             <h2>Contract Details</h2>
             <div id="transaction-detail-contents">
                 <p>Contract Key {transaction.contract_id}</p>
-                <p>Contract Location {transaction.contract_location}</p>
+                <p><b>Contract Location</b> {transaction.contract_location}</p>
                 <p>Requester {transaction.requester}</p>
                 <p>Target {transaction.target}</p>
                 {/*<p>Status {transaction.status}</p>

diff --git a/network-monitor/src/transactions-data.ts b/network-monitor/src/transactions-data.ts
@@ -18,12 +18,19 @@ export function handlePutRequest(
     timestamp: number,
     contract_location: number
 ) {
+    let requester_location = parseFloat(
+        requester.split(" (@ ")[1].split(")")[0]
+    );
+
+    requester = requester.split(" (@")[0];
+
     let obj_data = {
         change_type,
         transaction_id,
         contract_id,
         target,
         requester,
+        requester_location,
         unique_id:
             transaction_id + contract_id + target + requester + change_type,
         timestamp,
@@ -104,7 +111,7 @@ export function handleBroadcastEmitted(
     timestamp: number,
     contract_location: number
 ) {
-    let sender_location = sender.split(" (@")[1].split(")")[0];
+    let sender_location = parseFloat(sender.split(" (@")[1].split(")")[0]);
     sender = sender.split(" (@")[0];
 
     let upstream_location = upstream.split(" (@")[1].split(")")[0];
@@ -116,6 +123,7 @@ export function handleBroadcastEmitted(
         contract_id: key,
         target: broadcast_to,
         requester: sender,
+        requester_location: sender_location,
         unique_id: transaction_id + key + broadcast_to[0] + sender,
         timestamp,
         contract_location,
@@ -148,12 +156,19 @@ export function handleBroadcastReceived(
     timestamp: number,
     contract_location: number
 ) {
+    let requester_location = parseFloat(
+        requester.split(" (@")[1].split(")")[0]
+    );
+
+    requester = requester.split(" (@")[0];
+
     let obj_data = {
         change_type,
         transaction_id,
         contract_id: key,
         target,
         requester,
+        requester_location,
         unique_id: transaction_id + key + target + requester,
         timestamp,
         contract_location,