Inline PythStorage.Provider struct

ethereum/contracts/pyth/PythGetters.sol

@@ -13,15 +13,15 @@ contract PythGetters is PythState {
     }
 
     function chainId() public view returns (uint16){
-        return _state.provider.chainId;
+        return _state.chainId;
     }
 
     function pyth2WormholeChainId() public view returns (uint16){
-        return _state.provider.pyth2WormholeChainId;
+        return _state.pyth2WormholeChainId;
     }
 
     function pyth2WormholeEmitter() public view returns (bytes32){
-        return _state.provider.pyth2WormholeEmitter;
+        return _state.pyth2WormholeEmitter;
     }
 
     function latestPriceInfo(bytes32 priceId) public view returns (PythStructs.PriceInfo memory info){

ethereum/contracts/pyth/PythSetters.sol

@@ -7,15 +7,15 @@ import "./PythState.sol";
 
 contract PythSetters is PythState {
     function setChainId(uint16 chainId) internal {
-        _state.provider.chainId = chainId;
+        _state.chainId = chainId;
     }
 
     function setPyth2WormholeChainId(uint16 chainId) internal {
-        _state.provider.pyth2WormholeChainId = chainId;
+        _state.pyth2WormholeChainId = chainId;
     }
 
     function setPyth2WormholeEmitter(bytes32 emitterAddr) internal {
-        _state.provider.pyth2WormholeEmitter = emitterAddr;
+        _state.pyth2WormholeEmitter = emitterAddr;
     }
 
     function setWormhole(address wh) internal {

ethereum/contracts/pyth/PythState.sol

@@ -6,17 +6,11 @@ pragma solidity ^0.8.0;
 import "./PythStructs.sol";
 
 contract PythStorage {
-    struct Provider {
+    struct State {
+        address payable wormhole;
         uint16 chainId;
-
         uint16 pyth2WormholeChainId;
         bytes32 pyth2WormholeEmitter;
-    }
-
-    struct State {
-        address payable wormhole;
-
-        Provider provider;
 
         // Mapping of cached price information
         // priceId => PriceInfo