Merge branch 'BCFR-1071-Generic-MultiNodeClient' into BCFR-213-delete…

…-subs-on-unsubscribe

.golangci.yml

@@ -3,7 +3,7 @@ run:
 linters:
   enable:
     - exhaustive
-    - exportloopref
+    - copyloopvar
     - revive
     - goimports
     - gosec

.mockery.yaml

@@ -37,6 +37,7 @@ packages:
         config:
           filename: simple_keystore.go
           case: underscore
+      TxManager:
   github.com/smartcontractkit/chainlink-solana/pkg/solana/logpoller:
     interfaces:
       RPCClient:

Makefile

@@ -90,7 +90,7 @@ test_relay_unit:
 
 test_smoke:
 	cd ./integration-tests &&\
-	SELECTED_NETWORKS=SIMULATED go test -timeout 24h -count=1 -json $(args) -run TestSolanaOCRV2Smoke ./smoke 2>&1 | tee /tmp/gotest.log | gotestloghelper -json -tlogprefix -singlepackage -color
+	SELECTED_NETWORKS=SIMULATED go test -timeout 1h -count=1 -json $(args) -run TestSolanaOCRV2Smoke ./smoke 2>&1 | tee /tmp/gotest.log | gotestloghelper -json -tlogprefix -singlepackage -color
 
 test_relay_integration:
 	cd ./integration-tests &&\

contracts/crates/arrayvec/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "arrayvec"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

contracts/crates/arrayvec/src/lib.rs

@@ -90,6 +90,17 @@ macro_rules! arrayvec {
                 self.xs[offset..offset + len].copy_from_slice(&data);
                 self.len += len as $capacity_ty;
             }
+
+            /// Removes the last element from the array and returns it.
+            /// Returns `None` if the array is empty.
+            pub fn pop(&mut self) -> Option<$ty> {
+                if self.len > 0 {
+                    self.len -= 1;
+                    Some(self.xs[self.len as usize])
+                } else {
+                    None
+                }
+            }
         }
 
         impl std::ops::Deref for $name {
@@ -126,6 +137,38 @@ mod tests {
     }
     arrayvec!(ArrayVec, u8, u32);
 
+    #[test]
+    fn push_pop() {
+        let mut vec = ArrayVec::new();
+        assert!(vec.is_empty());
+        assert_eq!(vec.pop(), None);
+
+        vec.push(10);
+        assert_eq!(vec.len(), 1);
+        assert_eq!(vec.as_slice(), &[10]);
+
+        vec.push(20);
+        vec.push(30);
+        assert_eq!(vec.len(), 3);
+        assert_eq!(vec.as_slice(), &[10, 20, 30]);
+
+        // Popping elements
+        assert_eq!(vec.pop(), Some(30));
+        assert_eq!(vec.len(), 2);
+        assert_eq!(vec.as_slice(), &[10, 20]);
+
+        assert_eq!(vec.pop(), Some(20));
+        assert_eq!(vec.len(), 1);
+        assert_eq!(vec.as_slice(), &[10]);
+
+        assert_eq!(vec.pop(), Some(10));
+        assert_eq!(vec.len(), 0);
+        assert!(vec.is_empty());
+
+        // Popping from empty vec
+        assert_eq!(vec.pop(), None);
+    }
+
     #[test]
     fn remove() {
         let mut vec = ArrayVec::new();